[oe] [PATCH 2/2] Make the do_patch apply=yes param implicit if extension is .diff/.patch

Chris Larson clarson at kergoth.com
Mon May 24 20:30:28 UTC 2010


From: Chris Larson <chris_larson at mentor.com>

For .diff/.patch you need to apply manually, you can specify apply=no.

Signed-off-by: Chris Larson <chris_larson at mentor.com>

diff --git a/classes/patch.bbclass b/classes/patch.bbclass
index 6ef408f..5ad9c7c 100644
--- a/classes/patch.bbclass
+++ b/classes/patch.bbclass
@@ -39,21 +39,27 @@ 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)
+
+		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]
+
 		apply = parm.get("apply")
-		if apply != "yes" and not "patch" in parm:
-			if apply and apply != "no":
+		if apply is not None and apply != "yes" and not "patch" in parm:
+			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
 
-		bb.fetch.init([url],d)
-		url = bb.encodeurl((type, host, path, user, pswd, []))
-		local = os.path.join('/', bb.fetch.localpath(url, d))
-
-		base, ext = os.path.splitext(os.path.basename(local))
-		if ext in ('.gz', '.bz2', '.Z'):
-			local = os.path.join(workdir, base)
+		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:
diff --git a/recipes/aalib/aalib_1.4rc5.bb b/recipes/aalib/aalib_1.4rc5.bb
index e9c353b..a958608 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;apply=yes"
+	   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 7935450..372eb8f 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;apply=yes;striplevel=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 640ddcf..8209b42 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;apply=yes \
+           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 ac309a7..03df1f7 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;apply=yes \
+#           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 06b43a9..af88690 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;apply=yes \
+#           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 06d584e..96bc03c 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;apply=yes"
+	   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 8a4f8ad..7352f18 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;apply=yes"
+	   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 542ea30..248fbbf 100644
--- a/recipes/abiword/abiword_2.8.3.bb
+++ b/recipes/abiword/abiword_2.8.3.bb
@@ -6,7 +6,7 @@ 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;apply=yes"
+	   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 d3e1017..539eefb 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;apply=yes"
+	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 314ac73..5b4ab3f 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;apply=yes\
-  file://fix-crosscompile.patch;apply=yes\
+  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 5e57f48..fc2dd8d 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;apply=yes \
-                   file://netlink.diff;apply=yes \
-                   file://gcc44.diff;apply=yes \
+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 363b378..5096371 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;apply=yes"
+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 ef51657..a524039 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;apply=yes"
+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 970bf34..7e1b96a 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;apply=yes \
-                   file://fixfd.diff;apply=yes \
-                   file://netlink.diff;apply=yes"
+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 167cd22..96e4781 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;apply=yes \
-	   file://fixparsedomainflags.patch;apply=yes"
+	   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 369e10c..69fa1c6 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;apply=yes;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 83e8b88..0beff67 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;apply=yes"
+           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 9036456..4aeac96 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;apply=yes;striplevel=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 44f3f48..10731f8 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;apply=yes"
+		file://oe.patch"
 
 inherit autotools
 
diff --git a/recipes/albumshaper/albumshaper_2.1.bb b/recipes/albumshaper/albumshaper_2.1.bb
index 98d64e1..8edbc55 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;apply=yes"
+           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 2f4c09d..e5f6729 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;apply=yes \
-	file://h5400.patch;apply=yes \
-	file://sa11xx.patch;apply=yes \
-	file://adriver.h.patch;apply=yes"
+	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 75df982..b0ec97d 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;apply=yes"
+           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 a305906..6ad5f31 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;apply=yes \
-           file://unbreak_plugindir.patch;apply=yes"
+           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 a14501c..4dcdda4 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;apply=yes \
-	   file://fix_libmath.patch;apply=yes \
+           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 2a3cb67..af61ee1 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;apply=yes \
-	   file://fix_libmath.patch;apply=yes \
+           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 fff2de7..d815be4 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;apply=yes \
-	   file://fix_libmath.patch;apply=yes \
+           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 6000e7e..57f3cdc 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;apply=yes \
-	   file://fix_libmath.patch;apply=yes \
+           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 05f49ee..de522c7 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;apply=yes \
-	   file://fix_libmath.patch;apply=yes \
+           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
index 3a3f11d..0f9b14c 100644
--- a/recipes/alsa/alsa-lib_1.0.23.bb
+++ b/recipes/alsa/alsa-lib_1.0.23.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;apply=yes \
-           file://fix_libmath.patch;apply=yes \
+           file://fix-tstamp-declaration.patch \
+           file://fix_libmath.patch \
 	  "
 
 SRC_URI[md5sum] = "f48b50421d8a69d2d806d9c47e534f0d"
diff --git a/recipes/alsa/alsa-oss_1.0.15.bb b/recipes/alsa/alsa-oss_1.0.15.bb
index b711257..d6b09c5 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;apply=yes \
+	   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 c10e55b..c5dd934 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;apply=yes \
+	   file://libio.patch \
 	  "
 
 inherit autotools_stage
diff --git a/recipes/alsa/alsa-utils_1.0.14.bb b/recipes/alsa/alsa-utils_1.0.14.bb
index 3328039..9bef67a 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;apply=yes \
+	   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 51b9f5d..5fc07b1 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;apply=yes \
+           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 c51835c..174dfd4 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;apply=yes \
+           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 3f6081d..f53de13 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;apply=yes \
-	   file://alsa-utils-remove-xmlto.patch;apply=yes \
-	   file://alsa-utils-autoconf-strl-funcs.patch;apply=yes \
+           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 6db9d37..f4b92bb 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;apply=yes \
+	   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 65b76a4..462d919 100644
--- a/recipes/alsa/alsa-utils_1.0.20.bb
+++ b/recipes/alsa/alsa-utils_1.0.20.bb
@@ -6,7 +6,7 @@ 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;apply=yes \
+	   file://alsa-utils-remove-xmlto-1.0.19plus.patch \
 	  "
 	
 
diff --git a/recipes/amule/amule_2.1.3.bb b/recipes/amule/amule_2.1.3.bb
index de30268..0c1d6dd 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;apply=yes"
+           file://parser.patch"
 
 S = "${WORKDIR}/aMule-${PV}"
 
diff --git a/recipes/anki/anki_0.4.3.bb b/recipes/anki/anki_0.4.3.bb
index 8a9b935..97cc3ee 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;apply=yes"
+SRC_URI += "file://no-need-for-pyqt-at-buildtime.patch"
 S = "${WORKDIR}/anki-${PV}"
 
 SRC_URI[md5sum] = "90434860945de4c09d55cdb5dbe984fc"
diff --git a/recipes/anthy/anthy_9100e.bb b/recipes/anthy/anthy_9100e.bb
index 53802aa..83e61b7 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;apply=yes \
-           file://2ch_t.patch;apply=yes \
-           file://native-helpers.patch;apply=yes"
+           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 494f673..7361167 100644
--- a/recipes/apache2/apache2_2.2.14.bb
+++ b/recipes/apache2/apache2_2.2.14.bb
@@ -9,8 +9,8 @@ SRC_URI = "http://apache.mirrors.tds.net/httpd/httpd-${PV}.tar.bz2 \
 	   file://apr-sockets-patch;apply=yes \
 	   file://configure-patch;apply=yes \
 	   file://server-makefile-patch;apply=yes \
-	   file://configure.in.patch;apply=yes \
-	   file://apr.h.in.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 bb2db8f..91a341e 100644
--- a/recipes/apache2/apache2_2.2.3.bb
+++ b/recipes/apache2/apache2_2.2.3.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://apache.mirrors.tds.net/httpd/httpd-2.2.3.tar.bz2 \
 	   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;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 1d10d43..ddd28f3 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;apply=yes \
+	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 40e6dee..b619026 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;apply=yes \
+	file://find-apex-partition.patch \
 	"
 S = ${WORKDIR}/apex-${PV}/usr
 
diff --git a/recipes/apmd/apmd_3.2.2.bb b/recipes/apmd/apmd_3.2.2.bb
index 199f754..6b83132 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;apply=yes \
-           file://workaround.patch;apply=yes \
-           file://zaurus24.patch;apply=yes \
-           file://unlinux.patch;apply=yes \
-           file://libtool.patch;apply=yes \
+           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 2e9c42d..d0acb9d 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;apply=yes \
-	   file://nonrootinstall.patch;apply=yes"
+	   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 1910354..a180f2f 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;apply=yes \
-	   file://init.d.patch;apply=yes \
-           file://libdb.patch;apply=yes"
+	   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 f2b79a5..1902c05 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;apply=yes \
+           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 3c22da1..b5c1ebb 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;apply=yes"
+           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 e19b51e..e26d300 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;apply=yes"
+           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 764ee62..914f9ce 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;apply=yes \
-           file://configure_fixes.patch;apply=yes"
+           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 f5444f7..dd4493f 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;apply=yes"
+           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 827e714..cfb6e30 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;apply=yes"
+           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 cc481ff..3a49235 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;apply=yes \
-	   file://cleanup.patch;apply=yes \
-           file://configfix.patch;apply=yes"
+           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 e0d8f5b..a8362e4 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;apply=yes \
-#	   file://cleanup.patch;apply=yes \
-           file://configfix.patch;apply=yes"
+           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 8344b52..90f3ec5 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;apply=yes"
+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 b844c42..4d9a887 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;apply=yes \
-            file://noconfigure.patch;apply=yes"
+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 7a47109..0482e66 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;apply=yes \
-            file://noconfigure.patch;apply=yes \
-	    file://no-curl.patch;apply=yes"
+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 a4dea97..decec46 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;apply=yes \
-            file://noconfigure.patch;apply=yes \
-	    file://no-curl.patch;apply=yes"
+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 a701360..a7278ff 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;apply=yes \
-            file://noconfigure.patch;apply=yes"
+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 fddb7ff..a6d5277 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;apply=yes \
-            file://noconfigure.patch;apply=yes \
-	    file://no-curl.patch;apply=yes"
+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 9e9b866..8c3f21d 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;apply=yes \
-            file://noconfigure.patch;apply=yes"
+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 42808ac..e3157bb 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;apply=yes"
+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 7b2b79a..dab59a9 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;apply=yes"
+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 0f0e4c2..5aeb037 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;apply=yes"
+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 0aa15d6..84a4e12 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;apply=yes \
-            file://use-host.patch;apply=yes "
+SRC_URI += "file://no-ko-translation.patch \
+            file://use-host.patch "
 PR = "r3"
 
-SRC_URI += "file://nodoc.patch;apply=yes"
+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 798f20f..ab84f0d 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;apply=yes \
-            file://use-host.patch;apply=yes "
+SRC_URI += "file://no-ko-translation.patch \
+            file://use-host.patch "
 PR = "r3"
 
-SRC_URI += "file://nodoc.patch;apply=yes"
+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 4df3d66..c384149 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;apply=yes"
+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 a7b81ca..09dbbc4 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;apply=yes \
-            file://no-ko-translation.patch;apply=yes \
-            file://use-host.patch;apply=yes "
+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 b623407..0752d4a 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;apply=yes"
+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 6164c40..8c110d7 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;apply=yes \
-           file://Makefile.patch;apply=yes"
+           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 49257b0..17012b1 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;apply=yes \
-	file://arptables-init-busybox.patch;apply=yes \
+	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 b247878..34f3ca9 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;apply=yes \
-           file://06debian_manpages.patch;apply=yes \
+           file://05debian_fhs.patch \
+           file://06debian_manpages.patch \
            file://init.d \
            file://arpwatch.default \
            file://arpwatch.conf \
            file://ethercodes.dat \
-           file://make.patch;apply=yes \
+           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 b19edd2..a832b02 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;apply=yes \
+           file://if.h.patch \
            "
 
 S = "${WORKDIR}/${PN}-${PV}"
diff --git a/recipes/asterisk/asterisk_1.2.24.bb b/recipes/asterisk/asterisk_1.2.24.bb
index a4a5a88..891d569 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;apply=yes \
-	 file://uclibc-dns.patch;apply=yes \
-#         file://uclibc-define-glob.patch;apply=yes \
-         file://asterisk.patch;apply=yes \
-         file://enable-speex.patch;apply=yes"
+	 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 c6e2fbb..89e6a95 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;apply=yes \
-	 file://uclibc-dns.patch;apply=yes \
-         file://asterisk.patch;apply=yes \
-         file://enable-speex.patch;apply=yes"
+	 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 dee00f5..97a111e 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;apply=yes\
-	file://Makefile.patch;apply=yes\
+	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 49f2ec8..481fe84 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;apply=yes\
-	file://Makefile.patch;apply=yes\
+	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 c78ba3b..0b7ae79 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;apply=yes \
-	file://Makefile.patch;apply=yes \
+#	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 4f13b1d..db9e784 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;apply=yes\
-	file://Makefile.patch;apply=yes\
+	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 19fff07..e6aaba4 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;apply=yes \
-	   file://nonrootinstall.patch;apply=yes"
+	   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 b7ae512..e222042 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;apply=yes"
+                  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 da970f9..9559a04 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;apply=yes"
+	   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 d0a5a44..dfe524f 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;apply=yes"
+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 ba60377..d39ebf8 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;apply=yes \
-           file://0002-Making-image-directly-flashable.patch;apply=yes \
-           file://0003-AFEB9260-board-support.patch;apply=yes \
-           file://0004-AFEB9260-133-board-support.patch;apply=yes"
+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 3cf5f72..5ffb386 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;apply=yes;striplevel=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 c711fb8..e62480a 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;apply=yes;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 d75e7e4..b142aaf 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;apply=yes;striplevel=0 \
-	   file://audiofile-oldstyle.patch;apply=yes;striplevel=0 \
-	   file://audiofile-0.2.6.patch;apply=yes;striplevel=0 \
-	   file://CVE-2008-5824.patch;apply=yes \
+	   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 4e33194..3599d0d 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;apply=yes"
+	   file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/autoconf/autoconf.inc b/recipes/autoconf/autoconf.inc
index 0fc38db..35b0289 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;apply=yes"
+	   file://program_prefix.patch"
 
 inherit autotools
 
diff --git a/recipes/autoconf/autoconf_2.59.bb b/recipes/autoconf/autoconf_2.59.bb
index 6dc28bb..13a2f1d 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;apply=yes \
-	   file://autoreconf-exclude.patch;apply=yes \
-	   file://autoreconf-foreign.patch;apply=yes \
-	   file://autoreconf-gnuconfigize.patch;apply=yes \
-	   file://autoconf259-update-configscripts.patch;apply=yes \
-	   file://autoheader-nonfatal-warnings.patch;apply=yes \
-	   file://sizeof_types.patch;apply=yes \
-	   file://autoconf-x.patch;apply=yes \
-	   file://autoconf-sh.patch;apply=yes"
+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 f09759c..9542e21 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;apply=yes \
-	   file://autoreconf-exclude.patch;apply=yes \
-	   file://autoreconf-foreign.patch;apply=yes \
-	   file://autoreconf-gnuconfigize.patch;apply=yes \
-	   file://autoheader-nonfatal-warnings.patch;apply=yes \
-	   file://config-site.patch;apply=yes \
-	   file://autoconf-dont-execute-perl.patch;apply=yes \
+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;apply=yes"
+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 916aee3..41b3376 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;apply=yes \
-	    file://autoreconf-foreign.patch;apply=yes \
-	    file://autoheader-nonfatal-warnings.patch;apply=yes \
-	    file://autoreconf-gnuconfigize.patch;apply=yes \
-	    file://config-site.patch;apply=yes"
+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;apply=yes"
+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 8f84ae6..d0bc9d4 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;apply=yes \
-	    file://autoreconf-foreign.patch;apply=yes \
-	    file://autoheader-nonfatal-warnings.patch;apply=yes \
-	    file://autoreconf-gnuconfigize.patch;apply=yes \
-	    file://config-site.patch;apply=yes"
+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;apply=yes"
+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 950283c..1a658b6 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;apply=yes;name=patch1 \
-           ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-multi-parse-fix.patch;apply=yes;name=patch2 \
-           ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-non-replicated-ping.patch;apply=yes;name=patch3 \
-           file://cross.patch;apply=yes \
-           file://Makefile.rules-cross.patch;apply=yes \
-	   file://install.patch;apply=yes \
-	   file://auto.net-sort-option-fix.patch;apply=yes \
-	   file://autofs-additional-distros.patch;apply=yes \
-	   file://no-bash.patch;apply=yes"
+           ${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/avahi/avahi-python_0.6.21.bb b/recipes/avahi/avahi-python_0.6.21.bb
index 5e8107e..982f691 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;apply=yes \
-            file://configure-check-pymod.patch;apply=yes"
+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 0bd8bb2..53327a7 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;apply=yes"
+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 7a450b0..3cef5ae 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;apply=yes"
+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 f4c76a6..175d19f 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;apply=yes"
-SRC_URI += "file://avr32-ipv6-fix.patch;apply=yes"
+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/avr-evtd/avr-evtd_1.7.2.bb b/recipes/avr-evtd/avr-evtd_1.7.2.bb
index f1ede61..abfcac4 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;apply=yes \
+	   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 e29f346..052425b 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;apply=yes"
+	   file://configure.patch"
 B = "${WORKDIR}/build.${BUILD_SYS}.${TARGET_SYS}"
 
 inherit autotools
diff --git a/recipes/bacula/bacula-client_1.38.11.bb b/recipes/bacula/bacula-client_1.38.11.bb
index 873e3a5..0b663af 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;apply=yes \
+           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 45195b3..16b303a 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;apply=yes \
-	   file://desktop-file-fix.patch;apply=yes"
+	   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 f22ea08..4b4f57c 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;apply=yes"
+	   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-passwd/base-passwd_3.5.20.bb b/recipes/base-passwd/base-passwd_3.5.20.bb
index 75da83e..6e9c51b 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;apply=yes \
-  file://root-home.patch;apply=yes \
-  file://mysql.patch;apply=yes \
+  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 3ea515a..bdbbb83 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;apply=yes \
-  file://default_path.patch;apply=yes \
-  file://signames-mipsel.diff;apply=yes \
+  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 8bfb6d8..178f195 100644
--- a/recipes/bash/bash_3.2.bb
+++ b/recipes/bash/bash_3.2.bb
@@ -3,7 +3,7 @@ require bash.inc
 PR = "r8"
 
 SRC_URI += "\
-           file://builtins.patch;apply=yes \
+           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 \
@@ -43,7 +43,7 @@ SRC_URI += "\
            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;apply=yes \
+           file://default_path.patch \
            "
 
 SRC_URI[archive.md5sum] = "00bfa16d58e034e3c2aa27f390390d30"
diff --git a/recipes/batmand/batmand.inc b/recipes/batmand/batmand.inc
index 988a77a..625241f 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;apply=yes \
+           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 3bad99f..e7ead54 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;apply=yes \
-	   file://import_dirarg.patch;apply=yes"
+	   file://no_archive_format_guess_msg.patch \
+	   file://import_dirarg.patch"
 
 S = "${WORKDIR}/thelove at 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 0120333..fa94d13 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;apply=yes"
+           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 dc43788..c23a999 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;apply=yes"
+         file://x64fix.patch"
 
 PR = "r4"
 
diff --git a/recipes/beep/beep_1.2.2.bb b/recipes/beep/beep_1.2.2.bb
index 25d55dc..79a52c0 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;apply=yes"
+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 d7c8c8d..0c9e471 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;apply=yes"
+	   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 6dfae93..f8af487 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;apply=yes"
+           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 732ed23..33b1de2 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;apply=yes \
-	   file://configure.in.patch;apply=yes \
-	   file://conf.patch;apply=yes \
+           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 38e6eb2..45bf608 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;apply=yes \
-	   file://configure.in.patch;apply=yes \
-	   file://so_bsdcompat.patch;apply=yes \
+	   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 6bc2e86..d105dfc 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;apply=yes \
-	   file://configure.in.patch;apply=yes \
-	   file://so_bsdcompat.patch;apply=yes \
+	   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 902e33a..0965f72 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;apply=yes \
-	   file://configure.in.patch;apply=yes \
+	   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_2.14.90.0.6.bb b/recipes/binutils/binutils_2.14.90.0.6.bb
index 397fed4..c539a9f 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;apply=yes \
-     file://better_file_error.patch;apply=yes \
-     file://signed_char_fix.patch;apply=yes \
-     file://binutils-uclibc-001-debian.patch;apply=yes \
-     file://binutils-uclibc-100-conf.patch;apply=yes \
-     file://binutils-uclibc-200-build_modules.patch;apply=yes \
-     file://binutils-uclibc-210-cflags.patch;apply=yes \
-     file://binutils-100_cflags_for_build.patch;apply=yes \
-     file://plt32trunc.patch;apply=yes"
+     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 b4085ce..4f5a560 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;apply=yes \
-     file://better_file_error.patch;apply=yes \
-     file://signed_char_fix.patch;apply=yes \
-     file://binutils-uclibc-001-debian.patch;apply=yes \
-     file://binutils-uclibc-100-conf.patch;apply=yes \
-     file://binutils-uclibc-200-build_modules.patch;apply=yes \
-     file://binutils-uclibc-210-cflags.patch;apply=yes \
-     file://binutils-100_cflags_for_build.patch;apply=yes \
-     file://plt32trunc.patch;apply=yes \
-     file://600-arm-textrel.patch;apply=yes \
-     file://binutils-2.14.90.0.7-fix-broken-configure.patch;apply=yes"
+     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 ef8399f..91cf368 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;apply=yes \
-     file://better_file_error.patch;apply=yes \
-     file://signed_char_fix.patch;apply=yes \
-     file://objdump_fix.patch;apply=yes \
-     file://binutils-100_cflags_for_build.patch;apply=yes \
-     file://binutils-2.15.91.0.1-uclibc-100-conf.patch;apply=yes \
-     file://binutils-2.15.90.0.3-uclibc-200-build_modules.patch;apply=yes \
-     file://binutils-2.15-allow-gcc-4.0.patch;apply=yes"
+     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 bdfa211..688856c 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;apply=yes;name=patch1 \
-     ${CROSSTOOL_PATCH_URL}binutils-2.15-psignal.patch;apply=yes;name=patch2 \
-     ${CROSSTOOL_PATCH_URL}binutils-skip-comments.patch;apply=yes;name=patch3 \
-     ${CROSSTOOL_PATCH_URL}callahan.patch;apply=yes;name=patch4 \
-     ${CROSSTOOL_PATCH_URL}cross-gprof.patch;apply=yes;name=patch5 \
-     ${CROSSTOOL_PATCH_URL}stabs-tweak.patch;apply=yes;name=patch6 \
-     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;apply=yes"
+     ${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 bab319f..cbaa4a5 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;apply=yes \
-     file://binutils-uclibc-100-uclibc-conf.patch;apply=yes \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;apply=yes \
-     file://binutils-uclibc-300-006_better_file_error.patch;apply=yes \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;apply=yes \
-     file://binutils-uclibc-400-mips-ELF_MAXPAGESIZE-4K.patch;apply=yes \
-     file://binutils-uclibc-702-binutils-skip-comments.patch;apply=yes"
+     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 7d48382..369dd0a 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;apply=yes \
-     file://binutils-uclibc-100-uclibc-conf.patch;apply=yes \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;apply=yes \
-     file://binutils-uclibc-300-006_better_file_error.patch;apply=yes \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;apply=yes \
-     file://binutils-uclibc-400-mips-ELF_MAXPAGESIZE-4K.patch;apply=yes \
-     file://binutils-uclibc-702-binutils-skip-comments.patch;apply=yes"
+     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 b82da61..c8aa2de 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;apply=yes \
-     file://better_file_error.patch;apply=yes \
-     file://signed_char_fix.patch;apply=yes \
-     file://binutils-2.16-objcopy-rename-errorcode.patch;apply=yes \
-     file://binutils-100_cflags_for_build.patch;apply=yes"
+     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;apply=yes"
+SRC_URI += "file://binutils-2.16-linux-uclibc.patch"
 
 # arm thumb support patches
-SRC_URI += "file://binutils-2.16-thumb-trampoline.patch;apply=yes"
-SRC_URI += "file://binutils-2.16-thumb-glue.patch;apply=yes"
+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;apply=yes"
+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 f0ee699..d107431 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;apply=yes \
-     file://binutils-uclibc-100-uclibc-conf.patch;apply=yes \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;apply=yes \
-     file://binutils-uclibc-300-006_better_file_error.patch;apply=yes \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;apply=yes \
-     file://binutils-uclibc-400-mips-ELF_MAXPAGESIZE-4K.patch;apply=yes \
-     file://binutils-uclibc-702-binutils-skip-comments.patch;apply=yes"
+     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 eed0c4a..0d2ce9f 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;apply=yes \
-     file://binutils-uclibc-100-uclibc-conf.patch;apply=yes \
-     file://110-arm-eabi-conf.patch;apply=yes \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;apply=yes \
-     file://binutils-uclibc-300-006_better_file_error.patch;apply=yes \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;apply=yes \
+     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 5952896..9a4950d 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;apply=yes \
-     file://binutils-uclibc-100-uclibc-conf.patch;apply=yes \
-     file://binutils-configure-texinfo-version.patch;apply=yes \
-     file://110-arm-eabi-conf.patch;apply=yes \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;apply=yes \
-     file://binutils-uclibc-300-006_better_file_error.patch;apply=yes \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;apply=yes \
+     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 bc86c39..e8a6ebe 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;apply=yes \
-     file://binutils-uclibc-100-uclibc-conf.patch;apply=yes \
-     file://binutils-configure-texinfo-version.patch;apply=yes \
-     file://110-arm-eabi-conf.patch;apply=yes \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;apply=yes \
-     file://binutils-uclibc-300-006_better_file_error.patch;apply=yes \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;apply=yes \
+     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 4d04f48..1ffa61d 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;apply=yes \
-     file://signed_char_fix.patch;apply=yes \
+     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;apply=yes \
-	file://300-006_better_file_error.patch;apply=yes \
-	file://702-binutils-skip-comments.patch;apply=yes \
-	file://110-arm-eabi-conf.patch;apply=yes \
-	file://300-012_check_ldrunpath_length.patch;apply=yes \
-	file://300-001_ld_makefile_patch.patch;apply=yes \
-	file://400-mips-ELF_MAXPAGESIZE-4K.patch;apply=yes \
+	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;apply=yes \
-#        file://501-avr32-fix-pool-alignment.patch;apply=yes \
+#        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;apply=yes \
+        file://binutils-2.17.atmel.1.2.6.patch.bz2 \
 "
 
 # Zecke's OSX fixes
-SRC_URI += " file://warning-free.patch;apply=yes "
+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 6825dff..f9bb77a 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;apply=yes \
-     file://binutils-uclibc-100-uclibc-conf.patch;apply=yes \
-     file://110-arm-eabi-conf.patch;apply=yes \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;apply=yes \
-     file://binutils-uclibc-300-006_better_file_error.patch;apply=yes \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;apply=yes \
-     file://binutils-uclibc-gas-needs-libm.patch;apply=yes \
-     file://binutils-arm-pr7093.patch;apply=yes \
-     file://binutils-x86_64_i386_biarch.patch;apply=yes \
+     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;apply=yes"
+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 28a044a..aab634b 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;apply=yes \
-     file://binutils-configure-texinfo-version.patch;apply=yes \
-     file://binutils-uclibc-100-uclibc-conf.patch;apply=yes \
-     file://110-arm-eabi-conf.patch;apply=yes \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;apply=yes \
-     file://binutils-uclibc-300-006_better_file_error.patch;apply=yes \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;apply=yes \
-     file://binutils-uclibc-gas-needs-libm.patch;apply=yes \
-     file://binutils-x86_64_i386_biarch.patch;apply=yes \
-     file://binutils-section-in-segment.patch;apply=yes;striplevel=0 \
-     file://parse-neon-vmov.diff;apply=yes \
+     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;apply=yes \
-     file://binutils-powerpc-ld-segfault.patch;apply=yes \
+     file://binutils-2.16.1-e300c2c3.patch \
+     file://binutils-powerpc-ld-segfault.patch \
      "
 
 # ep93xx crunch patches
-SRC_URI_append_ep9312 = " file://binutils-crunch.patch;apply=yes"
+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 c3d4d7b..68ac7c5 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;apply=yes \
-     file://binutils-uclibc-100-uclibc-conf.patch;apply=yes \
-     file://110-arm-eabi-conf.patch;apply=yes \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;apply=yes \
-     file://binutils-uclibc-300-006_better_file_error.patch;apply=yes \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;apply=yes \
-     file://binutils-uclibc-gas-needs-libm.patch;apply=yes \
-     file://binutils-arm-pr7093.patch;apply=yes \
-     file://binutils-x86_64_i386_biarch.patch;apply=yes \
+     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;apply=yes"
+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 725b611..dea4551 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;apply=yes \
-     file://binutils-uclibc-100-uclibc-conf.patch;apply=yes \
-     file://110-arm-eabi-conf.patch;apply=yes \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;apply=yes \
-     file://binutils-uclibc-300-006_better_file_error.patch;apply=yes \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;apply=yes \
-     file://binutils-uclibc-gas-needs-libm.patch;apply=yes \
-     file://binutils-arm-pr7093.patch;apply=yes \
-     file://binutils-x86_64_i386_biarch.patch;apply=yes \
+     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;apply=yes"
+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 9a1e5a1..0ebcb33 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;apply=yes \
-     file://110-arm-eabi-conf.patch;apply=yes \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;apply=yes \
-     file://binutils-uclibc-300-006_better_file_error.patch;apply=yes \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;apply=yes \
-     file://binutils-uclibc-gas-needs-libm.patch;apply=yes \
-     file://binutils-arm-pr7093.patch;apply=yes \
-     file://ld-stub-crash.patch;apply=yes;striplevel=0 \
-     file://thumb-func.patch;apply=yes \
+     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;apply=yes"
+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 3005954..2a081db 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;apply=yes \
-     file://binutils-uclibc-100-uclibc-conf.patch;apply=yes \
-     file://110-arm-eabi-conf.patch;apply=yes \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;apply=yes \
-     file://binutils-uclibc-300-006_better_file_error.patch;apply=yes \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;apply=yes \
-     file://binutils-uclibc-gas-needs-libm.patch;apply=yes \
-     file://binutils-arm-pr7093.patch;apply=yes \
-     file://binutils-x86_64_i386_biarch.patch;apply=yes \
+     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;apply=yes"
+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 ba5f95f..e573c27 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;apply=yes \
-     file://110-arm-eabi-conf.patch;apply=yes \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;apply=yes \
-     file://binutils-uclibc-300-006_better_file_error.patch;apply=yes \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;apply=yes \
-     file://binutils-uclibc-gas-needs-libm.patch;apply=yes \
-     file://binutils-x86_64_i386_biarch.patch;apply=yes \
+     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;apply=yes \
+     file://binutils-2.16.1-e300c2c3.patch \
      "
diff --git a/recipes/binutils/binutils_2.20.bb b/recipes/binutils/binutils_2.20.bb
index 70d97b0..9d0438a 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;apply=yes \
-     file://110-arm-eabi-conf.patch;apply=yes \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;apply=yes \
-     file://binutils-uclibc-300-006_better_file_error.patch;apply=yes \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;apply=yes \
-     file://binutils-uclibc-gas-needs-libm.patch;apply=yes \
-     file://ld-stub-crash.patch;apply=yes;striplevel=0 \
-     file://binutils-arm-non-empty-know.patch;apply=yes \
-     file://binutils_unexport_LD_LIBRARY_PATH_for_CC_FOR_BUILD.patch;apply=yes \
-     file://binutils-x86_64_i386_biarch.patch;apply=yes \
+     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;apply=yes \
-     file://binutils-powerpc-pr11088.patch;apply=yes \
+     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 b970c23..38f588f 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;apply=yes \
-     file://better_file_error.patch;apply=yes \
-     file://signed_char_fix.patch;apply=yes"
+     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 1857b1d..a435b56 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;apply=yes \
-     file://better_file_error.patch;apply=yes \
-     file://signed_char_fix.patch;apply=yes"
+     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 5e9f9ad..e852afb 100644
--- a/recipes/binutils/binutils_cvs.bb
+++ b/recipes/binutils/binutils_cvs.bb
@@ -8,13 +8,13 @@ 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;apply=yes;maxdate=20090801 \
-     file://binutils-uclibc-100-uclibc-conf.patch;apply=yes \
-     file://110-arm-eabi-conf.patch;apply=yes \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;apply=yes \
-     file://binutils-uclibc-300-006_better_file_error.patch;apply=yes \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;apply=yes \
-     file://binutils-uclibc-gas-needs-libm.patch;apply=yes \
+     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 () {
diff --git a/recipes/bison/bison.inc b/recipes/bison/bison.inc
index f5e880a..f05874f 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;apply=yes"
+	   file://m4.patch"
 
 INCPR = "r4"
 
diff --git a/recipes/bitchx/bitchx_1.1.bb b/recipes/bitchx/bitchx_1.1.bb
index 9baa7fc..2cebfd5 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;apply=yes"
+	   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 ca7f377..f9661dc 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;apply=yes \
+           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 f7c2a4a..cdbf2ba 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;apply=yes;striplevel=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 7475199..8ac16dd 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;apply=yes"
+  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 d4a9ca3..9419297 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;apply=yes \
-  file://h4000.patch;apply=yes \
-  file://uclibc-fix.patch;apply=yes \
-  file://rx3000.patch;apply=yes \
+  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 a187472..d3dd02d 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;apply=yes"
+           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 30d0037..51173c5 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;apply=yes \
+           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 9ca1172..736c03d 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;apply=yes"
+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 2ab45c1..4d9cbfa 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;apply=yes \
-	   file://cs-typo.patch;apply=yes"
+	   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 0f28ced..710987b 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;apply=yes "
+#           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 fa76c9a..1cc93ef 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;apply=yes" 
+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-alsa_3.33.bb b/recipes/bluez/bluez-utils-alsa_3.33.bb
index 0e967a2..c48ed1b 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;apply=yes" 
+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 ff6180b..9933748 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;apply=yes \
-        file://handle-eintr.patch;apply=yes;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;apply=yes"
+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 1c540a4..d757459 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;apply=yes"
+           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 2335eec..8d202da 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;apply=yes" 
+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 adf3047..0083f15 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;apply=yes;striplevel=0"
+        file://avinfo-link.patch;striplevel=0"
 
 S = "${WORKDIR}/bluez-${PV}"
 
diff --git a/recipes/bluez/bluez4.inc b/recipes/bluez/bluez4.inc
index a398781..1807c95 100644
--- a/recipes/bluez/bluez4.inc
+++ b/recipes/bluez/bluez4.inc
@@ -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;apply=yes \
-  file://sbc-thumb.patch;apply=yes \
+  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 3d91a86..17fd98f 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;apply=yes \
-  file://sbc-thumb.patch;apply=yes \
+  file://fix-dfutool-usb-declaration-mismatch.patch \
+  file://sbc-thumb.patch \
   file://bluetooth.conf \
-#  file://hid2hci_usb_init.patch;apply=yes \
+#  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 757a0e6..1b22602 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;apply=yes \
-  file://sbc-thumb.patch;apply=yes \
+  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 0d0c3a4..b1dabd1 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;apply=yes \
-  file://sbc-thumb.patch;apply=yes \
+  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 2b2c7e3..c305b10 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;apply=yes "
+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.bb b/recipes/bluez/ussp-push_0.11.bb
index e60534e..42b9008 100644
--- a/recipes/bluez/ussp-push_0.11.bb
+++ b/recipes/bluez/ussp-push_0.11.bb
@@ -7,7 +7,7 @@ LICENSE = "GPLv2"
 PR = "r1"
 
 SRC_URI = "http://www.xmailserver.org/ussp-push-${PV}.tar.gz \
-	file://hci_remote_name.patch;apply=yes"
+	file://hci_remote_name.patch"
 
 S = "${WORKDIR}/ussp-push-${PV}"
 
diff --git a/recipes/bmon/bmon_2.1.0.bb b/recipes/bmon/bmon_2.1.0.bb
index c654b22..0f263ab 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;apply=yes"
+           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 0e382b5..d75a099 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;apply=yes;striplevel=2 \
-           file://debian-patch.diff;apply=yes;striplevel=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 f5763cf..3052c1b 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;apply=yes"
+           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 6e36f35..ab4c86b 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;apply=yes \
+           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 4c55a0e..67cec90 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;apply=yes"
+	 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 692fd58..7ab5171 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;apply=yes"
-SRC_URI_append_mtx-2 = " file://disable-epoll.patch;apply=yes"
+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 3366238..d712cf7 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;apply=yes \
-  file://atomic_count_gcc_atomicity.patch;apply=yes \
-  file://gcc43.patch;apply=yes \
-  file://gcc41.patch;apply=yes \
+  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 8a95df1..35089b2 100644
--- a/recipes/boost/boost_1.34.1.bb
+++ b/recipes/boost/boost_1.34.1.bb
@@ -13,8 +13,8 @@ PR = "6"
 
 SRC_URI = "\
 	${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \
-	file://linux-uclibc.patch;apply=yes \
-	file://${PV}-gcc43.patch;apply=yes \
+	file://linux-uclibc.patch \
+	file://${PV}-gcc43.patch \
 	"
 
 S = "${WORKDIR}/${BOOST_P}"
diff --git a/recipes/boost/boost_1.36.0.bb b/recipes/boost/boost_1.36.0.bb
index 1b8e8e4..d5e7b0f 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;apply=yes \
-           file://01-no-serialization-test.patch;apply=yes \
-           file://02-atomic-count-pthreads-on-arm.patch;apply=yes \
-           file://03-exception-clone-destructor-fix.patch;apply=yes \
-           file://gcc-44.diff;apply=yes \
-           file://uclibc.patch;apply=yes \
-           file://sscanf.patch;apply=yes \
+           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 cb350c1..6daa475 100644
--- a/recipes/boost/boost_1.37.0.bb
+++ b/recipes/boost/boost_1.37.0.bb
@@ -3,10 +3,10 @@ include boost-36.inc
 PR = "${INC_PR}.1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2;name=boost1370tarbz2 \
-           file://arm-intrinsics.patch;apply=yes \
-           file://02-atomic-count-pthreads-on-arm.patch;apply=yes \
-           file://uclibc.patch;apply=yes \
-           file://sscanf.patch;apply=yes \
+           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 92b5f10..194de8e 100644
--- a/recipes/boost/boost_1.40.0.bb
+++ b/recipes/boost/boost_1.40.0.bb
@@ -3,7 +3,7 @@ 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;apply=yes \
+           file://uclibc.patch \
           "
 S = "${WORKDIR}/boost-1.40.0.cmake2"
 
diff --git a/recipes/boost/boost_1.41.0.bb b/recipes/boost/boost_1.41.0.bb
index 716b515..7a31629 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;apply=yes \
+           file://1.41.0_uclibc.patch \
           "
 S = "${WORKDIR}/boost-1.41.0.cmake0"
 
diff --git a/recipes/bootchart/bootchart_0.9.bb b/recipes/bootchart/bootchart_0.9.bb
index 03584eb..160cc06 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;apply=yes"
+           file://handheld.patch"
 
 
 do_install() {
diff --git a/recipes/bootmenu/bootmenu_0.6.bb b/recipes/bootmenu/bootmenu_0.6.bb
index c4cf32e..e1a7dd0 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;apply=yes"
+	   file://compile.patch"
 
 EXTRA_OEMAKE = ""
 
diff --git a/recipes/bootsplash/bootsplash_3.0.7.bb b/recipes/bootsplash/bootsplash_3.0.7.bb
index d928d3d..0903547 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;apply=yes \
-	 file://gcc-issues.patch;apply=yes"
+         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 89a86db..f0a5377 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;apply=yes"
+           file://directories.patch"
 
 inherit palmtop
 
diff --git a/recipes/brutefir/brutefir_1.0i.bb b/recipes/brutefir/brutefir_1.0i.bb
index 8709e4e..be13826 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;apply=yes \
+           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 6efe06f..305bae3 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;apply=yes"
+file://makefile.patch"
 
 S = "${WORKDIR}/bt950-${PV}"
 
diff --git a/recipes/btscanner/btscanner_1.0.bb b/recipes/btscanner/btscanner_1.0.bb
index a8ee1fe..a475b95 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;apply=yes \
-	   file://configure.patch;apply=yes"
+	   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 e2cfc25..ce101c9 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;apply=yes \
-           file://configurable-paths.patch;apply=yes \
+           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 6e9f06b..cbc0f7c 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;apply=yes"
+	   file://makefile.patch"
 
 S = "${WORKDIR}/btsco-${PV}/kernel"
 
diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc
index 5e0c5a4..8abda7c 100644
--- a/recipes/busybox/busybox.inc
+++ b/recipes/busybox/busybox.inc
@@ -18,17 +18,17 @@ SRC_URI = "\
   file://busybox-httpd \
   file://busybox-udhcpd \
   file://default.script file://simple.script \
-  file://dhcp-hostname.patch;apply=yes \
+  file://dhcp-hostname.patch \
   file://hwclock.sh \
-  file://ifupdown-spurious-environ.patch;apply=yes \
+  file://ifupdown-spurious-environ.patch \
   file://mount.busybox \
   file://syslog \
   file://syslog.conf \
-  file://udhcpscript.patch;apply=yes \
+  file://udhcpscript.patch \
   file://umount.busybox \
 "
 
-SRC_URI_append_nylon = " file://xargs-double-size.patch;apply=yes"
+SRC_URI_append_nylon = " file://xargs-double-size.patch"
 
 export EXTRA_CFLAGS = "${CFLAGS}"
 EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
diff --git a/recipes/busybox/busybox_1.11.3.bb b/recipes/busybox/busybox_1.11.3.bb
index 643b169..fa169ef 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;apply=yes \
-  file://B921600.patch;apply=yes \
-  file://fdisk_lineedit_segfault.patch;apply=yes \
-  file://iptunnel.patch;apply=yes \
-  file://busybox-appletlib-dependency.patch;apply=yes \
+  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 96087a2..57815f6 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;apply=yes \
-  file://busybox-1.13.2-depmod.patch;apply=yes \
-  file://busybox-1.13.2-init.patch;apply=yes \
-  file://busybox-1.13.2-killall.patch;apply=yes \
-  file://busybox-1.13.2-mdev.patch;apply=yes \
-  file://busybox-1.13.2-modprobe.patch;apply=yes \
-  file://busybox-1.13.2-printf.patch;apply=yes \
-  file://busybox-1.13.2-syslogd.patch;apply=yes \
-  file://busybox-1.13.2-tar.patch;apply=yes \
-  file://busybox-1.13.2-top24.patch;apply=yes \
-  file://busybox-1.13.2-unzip.patch;apply=yes \
-  file://busybox-1.13.2-wget.patch;apply=yes \
+  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;apply=yes \
-  file://udhcpc-fix-nfsroot.patch;apply=yes \
-  file://B921600.patch;apply=yes \
-  file://get_header_tar.patch;apply=yes \
-  file://busybox-appletlib-dependency.patch;apply=yes \
+  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 49ad8b3..ebe018c 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;apply=yes \
-  file://udhcpc-fix-nfsroot.patch;apply=yes \
-  file://B921600.patch;apply=yes \
-  file://get_header_tar.patch;apply=yes \
-  file://busybox-appletlib-dependency.patch;apply=yes \
+  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 5cb909a..07103e8 100644
--- a/recipes/busybox/busybox_1.15.3.bb
+++ b/recipes/busybox/busybox_1.15.3.bb
@@ -4,13 +4,13 @@ PR = "${INC_PR}.1"
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
   \
-  file://udhcpscript.patch;apply=yes \
-  file://udhcpc-fix-nfsroot.patch;apply=yes \
-  file://B921600.patch;apply=yes \
-  file://get_header_tar.patch;apply=yes \
-  file://busybox-appletlib-dependency.patch;apply=yes \
-  file://0000-wget-no-check-certificate.patch;apply=yes \
-  file://run-parts.in.usr-bin.patch;apply=yes \
+  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 7599e4e..c3ab626 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;apply=yes \
-	   file://df_rootfs.patch;apply=yes \
+	   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;apply=yes"
+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 dca729a..2a373ae 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;apply=yes \
+	   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 74775af..5887fbb 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;apply=yes \
-           file://busybox-appletlib-dependency.patch;apply=yes \
+           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;apply=yes;name=patch1 \
-            http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-iptun.patch;apply=yes;name=patch2 \
-            http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-logger.patch;apply=yes;name=patch3 \
-            http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-tail.patch;apply=yes;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 d4efdcd..065cabf 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;apply=yes \
-           file://adduser-longops.patch;apply=yes \
-           file://sort-z-nul.patch;apply=yes;status=upstream \
-           file://topmem.patch;apply=yes \
-           file://busybox-appletlib-dependency.patch;apply=yes \
+           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 30f0346..120ef8d 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;apply=yes \
-	   file://compile.patch;apply=yes \
-	   file://no-strip.patch;apply=yes"
+	   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 5e5585f..1e509a1 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;apply=yes"
+           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 87004ea..8ead80a 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;apply=yes"
+	   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 bbce485..c454ef9 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;apply=yes \
-	   file://ldflags.patch;apply=yes"
+	   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 e76bb69..a088230 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;apply=yes"
+	   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 e55cac2..b3d9ee9 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;apply=yes \
+           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 f343c29..b8e2f2c 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;apply=yes"
+           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 df0dbd3..963d684 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;apply=yes \
-	file://offsets_make.patch;apply=yes \
-	file://classpath_var.patch;apply=yes \
-	file://libmath.patch;apply=yes \
-	file://arm_mmap.patch;apply=yes \
+	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;apply=yes"
+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 2b3ece2..bf1b993 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;apply=yes \
+        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 bb7f712..142a40b 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;apply=yes \
-  file://cacao-codegen-arm2.patch;apply=yes \
-  file://cacao-arm-race.patch;apply=yes \
-  file://vfp-compat.patch;apply=yes \
-  file://cacao-disable-stackbase-check.patch;apply=yes \
-  file://cacao_PR99_C_0.99.3.patch;apply=yes \
+  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 0cfbd17..5ae0330 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;apply=yes \
-	file://cacao-disable-stackbase-check.patch;apply=yes \
-	file://cacao_PR99_C_0.99.3.patch;apply=yes \
+	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 baa1009..d9d3715 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;apply=yes \
+	   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 bb1f447..55064ce 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;apply=yes "
+           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 9d79222..f1723a7 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;apply=yes \
-	   file://0002-Change-_cairo_fixed_from_double-to-use-the-magic-number-technique.diff;apply=yes \
+	   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 d24fc39..544479b 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;apply=yes;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 8db3bb5..5830895 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;apply=yes;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 d030748..619469c 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;apply=yes "
+           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 147c1c7..e2fc212 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;apply=yes \
+#           file://configure_fix.patch \
           "
 
 
diff --git a/recipes/cairo/cairo_1.8.10.bb b/recipes/cairo/cairo_1.8.10.bb
index c09b413..fff9cac 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;apply=yes \
+           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 a111a51..de12f13 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;apply=yes \
+           file://dolt-fix.patch \
           "
 
 
diff --git a/recipes/cairo/libsvg-cairo_20050601.bb b/recipes/cairo/libsvg-cairo_20050601.bb
index 0451158..330b921 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;apply=yes"
+	   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 a41897a..ecc4b4b 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;apply=yes \
-           file://gcc4_and_expat.patch;apply=yes"
+           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 be646fa..bdd8e0d 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;apply=yes \
+           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 fee03db..e485e9c 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;apply=yes \
-           file://compile.patch;apply=yes"
+           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 ab1fc22..bb4995a 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;apply=yes \
+	  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 123c75e..1f12bdb 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;apply=yes"
+	   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 bf5cae3..1f00408 100644
--- a/recipes/ccache/ccache_2.4.bb
+++ b/recipes/ccache/ccache_2.4.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 PR = "r2"
 
 SRC_URI = "http://samba.org/ftp/ccache/ccache-${PV}.tar.gz \
-	file://ccache-gcov.patch;apply=yes \
+	file://ccache-gcov.patch \
 	"
 
 inherit autotools
diff --git a/recipes/ccrtp/ccrtp_1.7.0.bb b/recipes/ccrtp/ccrtp_1.7.0.bb
index e200692..c61dd73 100644
--- a/recipes/ccrtp/ccrtp_1.7.0.bb
+++ b/recipes/ccrtp/ccrtp_1.7.0.bb
@@ -5,7 +5,7 @@ DEPENDS = "commoncpp2"
 PR = "r0"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/ccrtp/ccrtp-${PV}.tar.gz;name=archive \
-           file://configure.ac.patch;apply=yes"
+           file://configure.ac.patch"
 SRC_URI[archive.md5sum] = "eb86cd2ac06af27ea60b1a349122605c"
 SRC_URI[archive.sha256sum] = "923cd26ffc43903ef33704e46fd57f659c3ad01554927fe323635a73082d56ae"
 
diff --git a/recipes/ccxstream/ccxstream_1.0.15.bb b/recipes/ccxstream/ccxstream_1.0.15.bb
index 604db02..d2970a1 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;apply=yes \
+	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 bbc10e8..1817195 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;apply=yes \
-         file://Makefile.in.patch;apply=yes \
-         file://interface_Makefile.in.patch;apply=yes \
-         file://paranoia_Makefile.in.patch;apply=yes \
-         file://cdparanoia-III-10.2-privatefix.patch;apply=yes \
-	 file://configure.in.patch;apply=yes"
+         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 862b7cd..9d082a9 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;apply=yes \
-         file://Makefile.patch;apply=yes"
+         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 1edc8c2..2bad00e 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;apply=yes \
-	 file://Makefile.in.patch;apply=yes \
-	 file://interface_Makefile.in.patch;apply=yes \
-	 file://paranoia_Makefile.in.patch;apply=yes \
-	 file://configure.in.patch;apply=yes "
+	 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 7564563..2986328 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;apply=yes"
+	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 e738ed1..997fb63 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;apply=yes"
+	 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 4e65376..838ab72 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;apply=yes \
-	 file://cddb_connect_to_server.c.patch;apply=yes \
-	 file://cdstatus.patch;apply=yes"
+	 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 311b9f6..eaed3f6 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;apply=yes"
+	file://install-no-owner.patch"
 
 inherit autotools
 
diff --git a/recipes/cetools/cetools_0.3.bb b/recipes/cetools/cetools_0.3.bb
index a3ccb89..3a9c774 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;apply=yes"
+	   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 7ca4f27..9bd800d 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;apply=yes"
+	   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 d91266e..2461947 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;apply=yes"
+SRC_URI += "file://autofoo.patch"
 
 inherit autotools
 
diff --git a/recipes/char-driver/char-driver.bb b/recipes/char-driver/char-driver.bb
index 4307a7b..22f6d5e 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;apply=yes \
-#   file://sysctl.patch;apply=yes \
+   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 3c7442e..5328dbd 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;apply=yes"
+           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 5b78309..adbdc3f 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;apply=yes \
-	  file://Makefile.in.patch;apply=yes \
-	  file://Makefile.cget.patch;apply=yes \
-	  file://util.patch;apply=yes"
+	  file://configure.patch \
+	  file://Makefile.in.patch \
+	  file://Makefile.cget.patch \
+	  file://util.patch"
 INC_PR = "r7"
 PR = "${INC_PR}.0"
 
diff --git a/recipes/cherokee/cherokee_0.5.3.bb b/recipes/cherokee/cherokee_0.5.3.bb
index 6664bf0..6815108 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;apply=yes \
-                  file://Makefile.in.patch;apply=yes \
-                  file://Makefile.cget.patch;apply=yes \
-                  file://util.patch;apply=yes"
+SRC_URI_append = "file://configure.patch \
+                  file://Makefile.in.patch \
+                  file://Makefile.cget.patch \
+                  file://util.patch"
 
 require cherokee.inc
 PR = "${INC_PR}.0"
diff --git a/recipes/cherokee/cherokee_0.5.5.bb b/recipes/cherokee/cherokee_0.5.5.bb
index 6adff07..df94993 100644
--- a/recipes/cherokee/cherokee_0.5.5.bb
+++ b/recipes/cherokee/cherokee_0.5.5.bb
@@ -1,5 +1,5 @@
-SRC_URI_append = "file://configure.in.patch;apply=yes \
-                  file://Makefile.am.patch;apply=yes"
+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
diff --git a/recipes/chicken/chicken.inc b/recipes/chicken/chicken.inc
index 67ab980..178a41f 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;apply=yes \
-           file://translator-cross.patch;apply=yes"
+           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 26728a3..7fa01f1 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;apply=yes \
+	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 6d44555..7b060e0 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;apply=yes \
+	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 11e610a..a71f947 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;apply=yes \
+           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 8e73f3e..6431c68 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;apply=yes"
+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 fdd42ca..070d4af 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;apply=yes \
+           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 d56ada2..28e3277 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;apply=yes \
-	file://miscompilation-0.93.patch;apply=yes \
+	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 14c193c..2bdca7c 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;apply=yes;striplevel=0 \
-  file://xmlstream-fix.patch;apply=yes;striplevel=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 4577987..ce5eb20 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;apply=yes;striplevel=0 \
-  file://SimpleName.diff;apply=yes;striplevel=0 \
-  file://javanet-local.patch;apply=yes;striplevel=0 \
-  file://ecj_java_dir.patch;apply=yes \
-  file://autotools.patch;apply=yes \
-  file://decimalformat.patch;apply=yes \
-  file://cp-byte-loophelper.patch;apply=yes;striplevel=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_0.97.2.bb b/recipes/classpath/classpath-native_0.97.2.bb
index 39d9516..19c07a0 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;apply=yes;striplevel=0 \
-  file://SimpleName.diff;apply=yes;striplevel=0 \
-  file://javanet-local.patch;apply=yes;striplevel=0 \
-  file://sun-security-getproperty_0.96.1.patch;apply=yes;striplevel=0 \
-  file://ecj_java_dir.patch;apply=yes \
-  file://autotools.patch;apply=yes \
-  file://decimalformat.patch;apply=yes \
-  file://cp-byte-loophelper.patch;apply=yes;striplevel=0 \
-  file://miscompilation.patch;apply=yes \
-  file://toolwrapper-exithook.patch;apply=yes \
+  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 dd64856..a8d8276 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;apply=yes;striplevel=0 \
-  file://sun-security-getproperty.patch;apply=yes;striplevel=0 \
-  file://ecj_java_dir.patch;apply=yes \
-  file://autotools.patch;apply=yes \
-  file://miscompilation.patch;apply=yes \
-  file://toolwrapper-exithook.patch;apply=yes \
+  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 2514e39..3846369 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;apply=yes;striplevel=0 \
-  file://xmlstream-fix.patch;apply=yes;striplevel=0 \
-  file://javanet-local.patch;apply=yes;striplevel=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 09734da..9751bbe 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;apply=yes;striplevel=0 \
-  file://xmlstream-fix.patch;apply=yes;striplevel=0 \
-  file://javanet-local.patch;apply=yes;striplevel=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 cccf9cf..b53ba2b 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;apply=yes;striplevel=0 \
-  file://SimpleName.diff;apply=yes;striplevel=0 \
-  file://javanet-local.patch;apply=yes;striplevel=0 \
-  file://ecj_java_dir.patch;apply=yes \
-  file://autotools.patch;apply=yes \
-  file://decimalformat.patch;apply=yes \
-  file://cp-byte-loophelper.patch;apply=yes;striplevel=0 \
-  file://drawpolyline.patch;apply=yes;striplevel=0 \
-  file://gtk-fix.patch;apply=yes;striplevel=0 \
-  file://toolwrapper-exithook.patch;apply=yes \
+  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 534ee5c..d64fa07 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;apply=yes;striplevel=0 \
-  file://ecj_java_dir.patch;apply=yes \
-  file://autotools.patch;apply=yes \
-  file://fix-gmp.patch;apply=yes \
-  file://toolwrapper-exithook.patch;apply=yes \
+  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 a82ce44..362d0aa 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;apply=yes \
+  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 6305956..7ba6e67 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;apply=yes \
+  file://datadir_java.patch \
   "
 
 # java-library must be last (it defines do_stage)
diff --git a/recipes/classpathx/gnumail_1.1.2.bb b/recipes/classpathx/gnumail_1.1.2.bb
index 2feb84f..cf85587 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;apply=yes \
+  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 b167229..fe7f28d 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;apply=yes"
+           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 b705458..71e36c2 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;apply=yes"
+           file://configure.patch"
 
 PARALLEL_MAKE=""
 
diff --git a/recipes/clutter/clutter-0.9_git.bb b/recipes/clutter/clutter-0.9_git.bb
index f5f0adb..5bbd8a8 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;apply=yes "
+           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 8091549..db270c1 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;apply=yes"
+           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 72e13ed..35f94c2 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;apply=yes"
+           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 5e37925..42dc2d8 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;apply=yes"
+           file://autofoo.patch"
 
 S = "${WORKDIR}/${PN}"
diff --git a/recipes/clutter/clutter_0.4svn.bb b/recipes/clutter/clutter_0.4svn.bb
index a87813c..9399180 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;apply=yes "
+	   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 4486cfc..e86cbaf 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;apply=yes "
+	   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 a665737..b6f52cf 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;apply=yes"
+           file://enable-tests-r2990.patch"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/clutter/clutter_svn.bb b/recipes/clutter/clutter_svn.bb
index d6dd51a..f2cd50b 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;apply=yes;maxrev=2989 \
-           file://enable-tests-r2990.patch;apply=yes;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 b7a967b..299cc17 100644
--- a/recipes/clutter/moblin-proto_git.bb
+++ b/recipes/clutter/moblin-proto_git.bb
@@ -6,7 +6,7 @@ PR = "r1"
 PE = "1"
 
 SRC_URI = "git://git.moblin.org/repos/users/pippin/prototype.git/;protocol=http \
-           file://paths.patch;apply=yes"
+           file://paths.patch"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/clutter/table_svn.bb b/recipes/clutter/table_svn.bb
index daa2d8b..b4308d8 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;apply=yes"
+           file://fixes.patch"
 
 S = "${WORKDIR}/table"
 
diff --git a/recipes/clutter/tidy_svn.bb b/recipes/clutter/tidy_svn.bb
index 3ceba03..f81c788 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;apply=yes"
+           file://tidy-enable-tests.patch"
 
 S = "${WORKDIR}/trunk"
 
diff --git a/recipes/cnc/openredalert_r438.bb b/recipes/cnc/openredalert_r438.bb
index 2ad8e56..8ff80e9 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;apply=yes \
+           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 e902923..cd0c282 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;apply=yes"
+	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 1ff66df..24078fd 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;apply=yes \
-	file://001-compcache-rzscontrol-cross-compile.patch;apply=yes \
-	file://002-compcache-modules-install.patch;apply=yes \
+	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 8508e54..a3a0be7 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;apply=yes \
-	file://001-compcache-rzscontrol-cross-compile.patch;apply=yes \
-	file://002-compcache-modules-install.patch;apply=yes \
+	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 736e1fc..34ff9a4 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;apply=yes"
+	   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 44a191a..fadee9f 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;apply=yes"
+	   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 1a1fd38..f4ce369 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;apply=yes"
+           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 3e89174..9c5e46b 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;apply=yes \
+           file://phrase-lenght.diff \
            file://connman-applet.desktop"
 
 inherit autotools gtk-icon-cache
diff --git a/recipes/connman/connman_0.46.bb b/recipes/connman/connman_0.46.bb
index b82fbd7..a7bf286 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;apply=yes \
-  file://no_system_user_perms.patch;apply=yes \
+  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 c6629fc..f1c5003 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;apply=yes \
+  file://link-against-libnl2.patch \
   file://connman \
 "
 
diff --git a/recipes/console-tools/console-tools_0.3.2.bb b/recipes/console-tools/console-tools_0.3.2.bb
index cd6ea48..5894a3a 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;apply=yes \
-           file://configure.patch;apply=yes \
-           file://compile.patch;apply=yes \
-           file://kbdrate.patch;apply=yes \
-           file://uclibc-fileno.patch;apply=yes \
+           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 7b0c310..41f26cf 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;apply=yes \
-  file://coreutils-install-use-STRIP.patch;apply=yes \
+  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 defd4de..d91a181 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;apply=yes"
+           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 3504d24..32f0f1f 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;apply=yes \
-  file://oe-old-tools.patch;apply=yes \
+  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 c43bc7b..539340f 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;apply=yes \
-            file://man.patch;apply=yes"
+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 bc8297c..709bd4a 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;apply=yes \
-            file://man.patch;apply=yes"
+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 5dab14b..4602b8d 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;apply=yes"
+	   file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/corosync/corosync_1.2.1.bb b/recipes/corosync/corosync_1.2.1.bb
index f47127e..9ebea88 100644
--- a/recipes/corosync/corosync_1.2.1.bb
+++ b/recipes/corosync/corosync_1.2.1.bb
@@ -5,7 +5,7 @@ PR = "r0"
 
 SRC_URI = " \
 	ftp://ftp@corosync.org/downloads/corosync-${PV}/corosync-${PV}.tar.gz;name=tar \
-	file://fix-lcrso-linkage.patch;apply=yes \
+	file://fix-lcrso-linkage.patch \
 	file://init \
 	file://corosync.conf \
 	file://volatiles \
diff --git a/recipes/corsair/corsair_0.2.6.bb b/recipes/corsair/corsair_0.2.6.bb
index 7b28489..5bb7ee2 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;apply=yes"
+           file://corsair-opie.patch"
 
 S = "${WORKDIR}/corsair"
 
diff --git a/recipes/cpio/cpio_2.5.bb b/recipes/cpio/cpio_2.5.bb
index e6407d3..b4504ba 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;apply=yes"
+	   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 36a1e0f..048c450 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;apply=yes"
+	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 4834296..efbc7f3 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;apply=yes"
+	   file://nonrootinstall.patch"
 
 inherit autotools
 
diff --git a/recipes/cpufreqd/cpufrequtils_006.bb b/recipes/cpufreqd/cpufrequtils_006.bb
index 513d711..4574e39 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;apply=yes \
+           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 38080cc..3f4ddfc 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;apply=yes"
+           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 84a9974..e3e2df5 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;apply=yes \
-	file://cramfs-andersee.patch;apply=yes"
+	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 384eed1..2a08477 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;apply=yes \
-	file://cramfs-andersee.patch;apply=yes"
+	file://makefile.patch \
+	file://cramfs-andersee.patch"
 
 do_compile() {
 	oe_runmake
diff --git a/recipes/crimsonfields/crimsonfields_0.4.8.bb b/recipes/crimsonfields/crimsonfields_0.4.8.bb
index 53c99bb..94879b3 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;apply=yes"
+           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 b1542d1..685ad18 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;apply=yes \
-	   file://time.patch;apply=yes \
+	   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 0a3ef24..991e090 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;apply=yes"
+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 7529eb3..efc2eca 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;apply=yes;striplevel=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 537386c..e636a7f 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;apply=yes"
+	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 9da617c..877187f 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;apply=yes"
+           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 a301597..fd37246 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;apply=yes"
+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 14efa1d..c65cbb7 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;apply=yes \
-		    file://skip_tools.patch;apply=yes \
-		    file://configure.patch;apply=yes \
+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 ad6a27f..0209e8d 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;apply=yes"
+           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 80a5af5..28072de 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;apply=yes;striplevel=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 feb1ff6..d1985d5 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;apply=yes;striplevel=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 69bb027..2a72022 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;apply=yes;striplevel=0 \
-            file://curl-add_all_algorithms.patch;apply=yes \
-            file://curl-7.19.5-CVE-2009-2417.patch;apply=yes;striplevel=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 ed31ee6..2a113c0 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;apply=yes;striplevel=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 437fe47..500294f 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;apply=yes;striplevel=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 c451995..a7864db 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;apply=yes;striplevel=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 f92bdf4..cab5dd2 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;apply=yes"
+	   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 c4fbb7a..b345a9c 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;apply=yes"
+	   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 c5ccd2c..37ddbeb 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;apply=yes \
-           file://tail.patch;apply=yes \
-           file://imapopts.c.gcc4.patch;apply=yes \
-           file://imapopts.h.gcc4.patch;apply=yes \
+           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;apply=yes \
+           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 af6df3e..648ccea 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;apply=yes \
-           file://tail.patch;apply=yes"
+           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 99c9d9e..47a26e0 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;apply=yes"
+	   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 65f4b16..d83670e 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;apply=yes \
-	   file://client.c.patch;apply=yes"
+	   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 3380800..319917d 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;apply=yes;name=patch \
-	file://makefile-build-cc.diff;apply=yes"
+	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 6c1bce9..5ca02ca 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;apply=yes"
+	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 c9975b7..1ba7d43 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;apply=yes \
-           file://no-neon-version-test.patch;apply=yes \
-           file://Makefile.in.patch;apply=yes \
+           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 7ecbb59..6cdef4b 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;apply=yes \
+           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 a1b41be..e1d3a12 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;apply=yes"
+	   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 08e46f9..3b9bab8 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;apply=yes"
+#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 c7515c8..c5ecfde 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;apply=yes"
+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 2098aa2..483a0bf 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;apply=yes \
-  file://makefile.patch;apply=yes"
+  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 c000611..4f69104 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;apply=yes"
+	   file://configure.patch"
 
 S="${WORKDIR}/dbh_${PV}"
 
diff --git a/recipes/dbus/dbus-c++_git.bb b/recipes/dbus/dbus-c++_git.bb
index 56be9bd..7d9db3e 100644
--- a/recipes/dbus/dbus-c++_git.bb
+++ b/recipes/dbus/dbus-c++_git.bb
@@ -8,7 +8,7 @@ PE = "1"
 PV = "0.5.0+gitr${SRCPV}"
 
 SRC_URI = "git://gitorious.org/dbus-cplusplus/mainline.git;protocol=git"
-#           file://fix-linking.patch;apply=yes"
+#           file://fix-linking.patch"
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
diff --git a/recipes/dbus/dbus-glib-native_0.74.bb b/recipes/dbus/dbus-glib-native_0.74.bb
index fe19cf4..f41aec5 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;apply=yes"
+	   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 3222634..a40e3fa 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;apply=yes"
+	   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 da1331f..54997c3 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;apply=yes \
-  file://no-examples.patch;apply=yes \
+  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 d50454e..149ebac 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;apply=yes \
-	   file://no-introspect.patch;apply=yes"
+	   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 def9351..35975c8 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;apply=yes \
-	   file://no-introspect.patch;apply=yes"
+	   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 83ac7e0..7cae6ad 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;apply=yes \
-	   file://no-introspect.patch;apply=yes"
+	   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 953dac1..d883f0a 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;apply=yes \
-  file://tmpdir.patch;apply=yes \
-  file://fedora-compile-fix.patch;apply=yes \
+  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 bde742d..97d27b3 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;apply=yes \
-  file://tmpdir.patch;apply=yes \
-  file://fix-install-daemon.patch;apply=yes \
+  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 9d00be1..ec66960 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;apply=yes \
-  file://tmpdir.patch;apply=yes \
-  file://fix-install-daemon.patch;apply=yes \
-  file://0001-Make-the-default-DBus-reply-timeout-configurable.patch;apply=yes \
+  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 fc7d8f1..43805a5 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;apply=yes \
-  file://fix-install-daemon.patch;apply=yes \
-  file://0001-Make-the-default-DBus-reply-timeout-configurable.patch;apply=yes \
+  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 f7aad56..35a5267 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;apply=yes \
-  file://fix-install-daemon.patch;apply=yes \
-  file://0001-Make-the-default-DBus-reply-timeout-configurable.patch;apply=yes \
+  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 fd8cd80..4e408e7 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;apply=yes \
-  file://fix-install-daemon.patch;apply=yes \
-  file://0001-Make-the-default-DBus-reply-timeout-configurable.patch;apply=yes \
+  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 32ac8a5..830816f 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;apply=yes \
-  file://will-2.patch;apply=yes \
-  file://will-3.patch;apply=yes \
-  file://will-4.patch;apply=yes \
-  file://will-5.patch;apply=yes \
-  file://will-6.patch;apply=yes \
+  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;apply=yes \
-  file://tmpdir.patch;apply=yes \
-  file://fix-install-daemon.patch;apply=yes \
-  file://0001-Make-the-default-DBus-reply-timeout-configurable.patch;apply=yes \
+  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 f8f6be6..df3f761 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;apply=yes "
+	      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 5ddde6e..761ef87 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;apply=yes "
+#	      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 7444e22..6ee8fc9 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;apply=yes \
-	   file://strip.patch;apply=yes"
+	   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 06b022a..b4a35ae 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;apply=yes"
+	   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 4a94aa6..dc11678 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;apply=yes;striplevel=0 \
-	   file://extra-device-check.patch;apply=yes \
-	   file://correct-theme-name.patch;apply=yes"
+           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 8b95e1f..c82ecd4 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;apply=yes \
-           file://install-detect-tsdevice.patch;apply=yes"
+           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 cdde5bd..a1e5531 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;apply=yes \
-	    file://devhelp-webkit.patch;apply=yes"
+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 326ba51..e761d48 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;apply=yes"
+	   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 130ecf5..ad9bf79 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;apply=yes \
-	   file://remove_insanity.patch;apply=yes "
+	   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 7f30d7b..bd0cbb9 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;apply=yes \
-	   file://remove_insanity.patch;apply=yes "
+       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 ff01350..a7f0339 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;apply=yes \
+  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 54a7495..69d11d6 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;apply=yes \
-           file://dbus-api-fix.patch;apply=yes \
+           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 2bc8c1b..4acc05c 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;apply=yes \
+           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 4f0e01e..b29bdad 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;apply=yes \
-           file://paths.patch;apply=yes \
-           file://no-ext-options.patch;apply=yes \
+           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 23abb36..e34665e 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;apply=yes \
-           file://paths.patch;apply=yes \
+           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 caa1c58..6d12899 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;apply=yes"
+	   file://make.patch"
 S = "${WORKDIR}/dhcp-${PV}"
 
 export BINDIR = "${sbindir}"
diff --git a/recipes/dhcp/dhcp3.inc b/recipes/dhcp/dhcp3.inc
index 1c242ac..c719ec0 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;apply=yes \
-	   file://useless-use-of-bash.patch;apply=yes \
+	   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;apply=yes;striplevel=0 \
+	   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 28dfa91..28ba70d 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;apply=yes \
-	   file://fixincludes.patch;apply=yes \
-	   file://useless-use-of-bash.patch;apply=yes \
+	   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 0e8a037..9feec74 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;apply=yes \
-	   file://fixincludes.patch;apply=yes \
-	   file://useless-use-of-bash.patch;apply=yes \
+	   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;apply=yes;striplevel=0 \
+	   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 649e2e0..1882de9 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;apply=yes \
-	   file://useless-use-of-bash.patch;apply=yes \
+	   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;apply=yes;striplevel=0 \
+	   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 2feb4c8..a9f57b4 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;apply=yes \
-	   file://paths.patch;apply=yes"
+	   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 2eb5b8d..b5da9ec 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;apply=yes \
-            file://ceil.patch;apply=yes \
-            file://ai_addrconfig.patch;apply=yes \
+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 e528613..ce6c53f 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;apply=yes \
-            file://ceil.patch;apply=yes \
-            file://diethome.patch;apply=yes \
-            file://getrlimit.patch;apply=yes \
+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 1486496..16043e9 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;apply=yes;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 7fae9aa..48d3ae5 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;apply=yes \
-         file://gtk2.patch;apply=yes \
-         file://fix_about_syntax.patch;apply=yes \
+         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/dillo_0.8.6.bb b/recipes/dillo/dillo_0.8.6.bb
index f28922e..bcfb8ea 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;apply=yes \
+         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 78bea95..ec2a802 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;apply=yes"
+           file://dircproxy.patch"
 
 inherit autotools
 
diff --git a/recipes/directfb/directfb.inc b/recipes/directfb/directfb.inc
index 1e4d525..f6508d7 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;apply=yes \
-    file://fix-font-missing-char.patch;apply=yes \
-    file://getpagesize.patch;apply=yes \
-    file://mkdfiff.patch;apply=yes \
-    file://dont-use-linux-config.patch;apply=yes \
-    file://ts_lib_autotools.patch;apply=yes \
+    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 39dd90a..414bcfe 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;apply=yes" 
+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 6931131..573e319 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;apply=yes \
-    file://fix-font-missing-char.patch;apply=yes \
-    file://mkdfiff.patch;apply=yes \
-    file://dont-use-linux-config.patch;apply=yes \
-    file://ts_lib_autotools.patch;apply=yes \
+    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 079ec9f..4581616 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;apply=yes \
-    file://mkdfiff.patch;apply=yes \
-    file://dont-use-linux-config.patch;apply=yes \
-    file://ts_lib_autotools.patch;apply=yes \
+    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 6edbce1..06d8ea8 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;apply=yes \
-    file://mkdfiff.patch;apply=yes \
-    file://dont-use-linux-config.patch;apply=yes \
-    file://ts_lib_autotools.patch;apply=yes \
+    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 3369dc5..35eb7c6 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;apply=yes \
-    file://mkdfiff.patch;apply=yes \
-    file://dont-use-linux-config.patch;apply=yes \
-    file://ts_lib_autotools.patch;apply=yes \
+    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 e636c93..cc0e4c0 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;apply=yes \
-    file://mkdfiff.patch;apply=yes \
-    file://dont-use-linux-config.patch;apply=yes \
-    file://ts_lib_autotools.patch;apply=yes \
+    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 2b042ec..d56bce5 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;apply=yes \
-    file://mkdfiff.patch;apply=yes \
-    file://dont-use-linux-config.patch;apply=yes \
-    file://ts_lib_autotools.patch;apply=yes \
+    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 e691aa6..50f093c 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;apply=yes \
-	   file://use_limits_h.patch;apply=yes \
+	   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 c3df8d8..4e43ec0 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;apply=yes \
+	   file://pkgconfig.patch \
 	  "
 
 do_compile() {
diff --git a/recipes/disko/disko_git.bb b/recipes/disko/disko_git.bb
index adc7949..71d694d 100644
--- a/recipes/disko/disko_git.bb
+++ b/recipes/disko/disko_git.bb
@@ -11,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;apply=yes \
+	   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 1f8486f..0034a06 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;apply=yes \
-	   file://no-man.patch;apply=yes \
+	   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 06abf27..e427a72 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;apply=yes"
+           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 618b83d..ce57cf0 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;apply=yes"
+           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 a23b553..614201d 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;apply=yes \
+  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 cc86048..18110ef 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;apply=yes"
+	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 a2eabf5..dbd8cec 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;apply=yes"
+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 24f5a6c..c61e33d 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;apply=yes \
-	file://mkdosfs-dir.patch;apply=yes \
-	file://alignment_hack.patch;apply=yes \
-	file://dosfstools-2.10-kernel-2.6.patch;apply=yes \
-	file://msdos_fat12_undefined.patch;apply=yes \
-	file://dosfstools-msdos_fs-types.patch;apply=yes \
-	file://include-linux-types.patch;apply=yes \
-	file://2.6.20-syscall.patch;apply=yes"
+	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 d56776a..bc5a87e 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;apply=yes \
-	   file://dosfstools-2.10-kernel-2.6.patch;apply=yes \
-           file://msdos_fat12_undefined.patch;apply=yes \
-	   file://include-linux-types.patch;apply=yes"
+	   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 c981586..211912a 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;apply=yes \
-           file://msdos_fat12_undefined.patch;apply=yes \
-	   file://include-linux-types.patch;apply=yes"
+	   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 2f91e8b..72db286 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;apply=yes"
+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 8eda929..c3c9a90 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;apply=yes \
-           file://noupdalt.patch;apply=yes"
+           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 c9883af..9d2771d 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;apply=yes"
+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 dc950d3..0fa48e6 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;apply=yes"
+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 e35f362..556d317 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;apply=yes"
+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 8482909..0c23708 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;apply=yes"
+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 336210b..92c8a96 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;apply=yes"
+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 17c0b76..15ec0de 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;apply=yes"
+	file://make.patch"
 
 inherit module-base
 
diff --git a/recipes/driftnet/driftnet-nogui_0.1.6.bb b/recipes/driftnet/driftnet-nogui_0.1.6.bb
index 9e4f0d2..ff96320 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;apply=yes"
+	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 100cd8f..ec4ff39 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;apply=yes"
+	file://arm.patch"
 
 S = "${WORKDIR}/driftnet-${PV}"
 
diff --git a/recipes/dropbear/dropbear.inc b/recipes/dropbear/dropbear.inc
index ed3f332..056732f 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;apply=yes \
-  file://configure.patch;apply=yes \
-  file://fix-2kb-keys.patch;apply=yes \
-  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 ac2c987..79a2de6 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;apply=yes"
+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 08512b7..168f5bb 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;apply=yes"
+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 e057f4f..0e36b99 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;apply=yes"
+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 f8344c4..03ef527 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;apply=yes \
+  file://configure.patch \
 "
 
 inherit autotools
diff --git a/recipes/dt/dt_15.14.bb b/recipes/dt/dt_15.14.bb
index 4a16027..39dc185 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;apply=yes "
-SRC_URI_append_linux-uclibcgnueabi = " file://no_aio.patch;apply=yes "
+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 c0e1f1c..e926de9 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;apply=yes \
+  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 f79eaa7..77a8509 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;apply=yes"
+           file://update-to-trunk.diff"
 
 PR = "r1"
 
diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb
index 9db46ca..97724a0 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;apply=yes;maxrev=37617 \
-  file://fix-profiles.diff;apply=yes;maxrev=39889 \
-  file://drop-illume-keyboards.patch;apply=yes \
+  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;apply=yes"
+SRC_URI_append_openmoko = " file://illume-disable-screensaver.patch"
 
 SRC_URI_append_shr = " \
-  file://illume-disable-screensaver.patch;apply=yes \
-  file://wizard-module-skipping.patch;apply=yes \
-  file://illume-flaunch-fix.patch;apply=yes \
-  file://illume-keyboard-flow.patch;apply=yes;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 472c860..92c235b 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;apply=yes \
-           file://allow-missing-xsession.patch;apply=yes \
-           file://run-Xinit.patch;apply=yes \
-           file://fix-auth-mode.patch;apply=yes \
-           file://use-bash.patch;apply=yes \
+           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/places_svn.bb b/recipes/e17/places_svn.bb
index 2d04a93..a18421f 100644
--- a/recipes/e17/places_svn.bb
+++ b/recipes/e17/places_svn.bb
@@ -5,7 +5,7 @@ PR = "r4"
 
 require e-module.inc
 
-SRC_URI += "file://fix-api.diff;apply=yes;maxrev=39830;pnum=3"
+SRC_URI += "file://fix-api.diff;maxrev=39830;pnum=3"
 
 do_configure_prepend() {
        sed -i -e /po/d -e /AM_GNU_GETTEXT/d configure.ac 
diff --git a/recipes/e2fsprogs/e2fsprogs_1.38.bb b/recipes/e2fsprogs/e2fsprogs_1.38.bb
index 76439ae..3401ed0 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;apply=yes \
-	    file://mkinstalldirs.patch;apply=yes \
-            file://file-open-mode.patch;apply=yes \
+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 0f1f739..d51cdcc 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;apply=yes"
+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 7d44272..9e9d7c0 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;apply=yes"
+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 cc1c858..379c07a 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;apply=yes"
+	   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 570edaf..98a2140 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;apply=yes \
-           file://gcc4.patch;apply=yes \
-           file://installnonroot.patch;apply=yes \
-           file://installcreatedirs.patch;apply=yes"
+           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 a3cdd80..fa5c2c2 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;apply=yes"
+           file://eciadsl-bash.patch"
 LICENSE = "GPL"
 RDEPENDS = "bash kernel-module-n_hdlc ppp grep"
 S = "${WORKDIR}/eciadsl-usermode-${PV}"
diff --git a/recipes/eds/eds-dbus_svn.bb b/recipes/eds/eds-dbus_svn.bb
index e9c26c3..20d7f79 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;apply=yes;maxrev=659 \
-           file://no_iconv_test.patch;apply=yes \
-           file://no_libedataserverui.patch;apply=yes;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 908674f..5821c55 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;apply=yes"
+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 57d4311..0a24a3a 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;apply=yes"
+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 e02e106..258e498 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;apply=yes"
+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 6d9fa5e..0da61f8 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;apply=yes"
+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 8735872..4ccfd28 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;apply=yes"
+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 21b1184..bb7eea5 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;apply=yes"
+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 e673b09..f32df8e 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;apply=yes;maxrev=43996 \
-  file://exit_uclibc_dns.patch;apply=yes;maxrev=47076 \
-  file://exit_uclibc.patch;apply=yes \
+  file://iconv.patch;maxrev=43996 \
+  file://exit_uclibc_dns.patch;maxrev=47076 \
+  file://exit_uclibc.patch \
 "
 
 ECORE_OECONF = "\
diff --git a/recipes/efl1/eina_svn.bb b/recipes/efl1/eina_svn.bb
index 8ec4f43..34e1aa8 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;apply=yes"
+SRC_URI += "file://gnu_source.patch"
 
 # Some upgrade path tweaking
 AUTO_LIBNAME_PKGS = ""
diff --git a/recipes/eggdbus/eggdbus_0.6.bb b/recipes/eggdbus/eggdbus_0.6.bb
index ab8e8cd..a7b5b87 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;apply=yes \
+          file://gtk-doc.patch \
           "
 
 SRC_URI = "${BASE_SRC_URI} \
-           file://marshal.patch;apply=yes \
+           file://marshal.patch \
           "
 
 SRC_URI_virtclass-native = "${BASE_SRC_URI}"
diff --git a/recipes/eglibc/eglibc_2.10.bb b/recipes/eglibc/eglibc_2.10.bb
index 454d4cf..c2ed435 100644
--- a/recipes/eglibc/eglibc_2.10.bb
+++ b/recipes/eglibc/eglibc_2.10.bb
@@ -8,10 +8,10 @@ PR_append = "+svnr${SRCPV}"
 SRCREV="10152"
 EGLIBC_BRANCH="eglibc-2_10"
 SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \
-           file://eglibc-svn-arm-lowlevellock-include-tls.patch;apply=yes \
-           file://armv4t-interworking.patch;apply=yes \
-           file://IO-acquire-lock-fix.patch;apply=yes \
-           file://shorten-build-commands.patch;apply=yes \
+           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"
diff --git a/recipes/eglibc/eglibc_2.11.bb b/recipes/eglibc/eglibc_2.11.bb
index 64bf7b6..26bef4c 100644
--- a/recipes/eglibc/eglibc_2.11.bb
+++ b/recipes/eglibc/eglibc_2.11.bb
@@ -9,9 +9,9 @@ PR_append = "+svnr${SRCPV}"
 SRCREV="10454"
 EGLIBC_BRANCH="eglibc-2_11"
 SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \
-           file://eglibc-svn-arm-lowlevellock-include-tls.patch;apply=yes \
-           file://IO-acquire-lock-fix.patch;apply=yes \
-           file://shorten-build-commands.patch;apply=yes \
+           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"
diff --git a/recipes/eglibc/eglibc_2.12.bb b/recipes/eglibc/eglibc_2.12.bb
index 1dfe465..e47c1a0 100644
--- a/recipes/eglibc/eglibc_2.12.bb
+++ b/recipes/eglibc/eglibc_2.12.bb
@@ -9,9 +9,9 @@ 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;apply=yes \
-           file://IO-acquire-lock-fix.patch;apply=yes \
-           file://shorten-build-commands.patch;apply=yes \
+           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"
diff --git a/recipes/eglibc/eglibc_2.9.bb b/recipes/eglibc/eglibc_2.9.bb
index 9a763e8..a7d9aed 100644
--- a/recipes/eglibc/eglibc_2.9.bb
+++ b/recipes/eglibc/eglibc_2.9.bb
@@ -8,10 +8,10 @@ PR_append = "+svnr${SRCPV}"
 SRCREV="10153"
 EGLIBC_BRANCH="eglibc-2_9"
 SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \
-           file://eglibc-svn-arm-lowlevellock-include-tls.patch;apply=yes \
-	   file://armv4t-interworking.patch;apply=yes \
-	   file://IO-acquire-lock-fix.patch;apply=yes \
-           file://shorten-build-commands.patch;apply=yes \
+           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"
diff --git a/recipes/eglibc/eglibc_svn.bb b/recipes/eglibc/eglibc_svn.bb
index d55dd20..bd42030 100644
--- a/recipes/eglibc/eglibc_svn.bb
+++ b/recipes/eglibc/eglibc_svn.bb
@@ -8,8 +8,8 @@ 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;apply=yes \
-	   file://IO-acquire-lock-fix.patch;apply=yes \
+           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"
diff --git a/recipes/ekiga/ekiga_3.0.2.bb b/recipes/ekiga/ekiga_3.0.2.bb
index ed05cc7..585332c 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;apply=yes"
+           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 8382986..a4d62e0 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;apply=yes \
+           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 c273c57..fb0e417 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;apply=yes \
+           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 ba0de49..71f82fe 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;apply=yes \
+           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 2ddc8d9..c53b72e 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;apply=yes \
+           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 c304bf7..3a24c31 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;apply=yes \
+           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 5f59c0c..827c8f3 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;apply=yes \
+           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 4e6d0e3..6591bd7 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;apply=yes \
+           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 9d7aa37..7d544d5 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;apply=yes \
+           file://rgb16.patch \
 "
 
 do_configure() {
diff --git a/recipes/elfkickers/elfkickers_2.0a.bb b/recipes/elfkickers/elfkickers_2.0a.bb
index 3f0ec5c..3474b56 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;apply=yes \
-           file://mjn3-sstrip.patch;apply=yes"
+           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 2073e8b..59588b1 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;apply=yes"
+	   file://warnings.patch"
 
 inherit autotools
 
diff --git a/recipes/elfutils/elfutils_0.131.bb b/recipes/elfutils/elfutils_0.131.bb
index 9dc7687..c250c9f 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;apply=yes"
+	   file://warnings.patch"
 
 inherit autotools
 
diff --git a/recipes/elfutils/elfutils_0.143.bb b/recipes/elfutils/elfutils_0.143.bb
index 6bab414..24cf074 100644
--- a/recipes/elfutils/elfutils_0.143.bb
+++ b/recipes/elfutils/elfutils_0.143.bb
@@ -7,7 +7,7 @@ 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;apply=yes;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 \
 "
diff --git a/recipes/elfutils/elfutils_0.89.bb b/recipes/elfutils/elfutils_0.89.bb
index 5ed80b4..a6f56a6 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;apply=yes"
+	   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 dc3f37c..6401b77 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;apply=yes \
+           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 1ec1216..02bc951 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;apply=yes \
-	   file://nostdlib-unwind.patch;apply=yes"
+	   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 f70c706..62a5ccd 100644
--- a/recipes/emacs/emacs-x11_23.1.bb
+++ b/recipes/emacs/emacs-x11_23.1.bb
@@ -13,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;apply=yes \
-	   file://nostdlib-unwind.patch;apply=yes"
+	   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_22.3.bb b/recipes/emacs/emacs_22.3.bb
index 8506ca2..5360483 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;apply=yes \
-	   file://nostdlib-unwind.patch;apply=yes"
+	   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 a071815..7b1a6c7 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;apply=yes \
-	   file://nostdlib-unwind.patch;apply=yes"
+	   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 3f60f72..c3a98a3 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;apply=yes"
+           file://use-qemu.patch"
 S = "${WORKDIR}/emacs"
 
 inherit autotools
diff --git a/recipes/emelfm2/emelfm2_0.0.8.bb b/recipes/emelfm2/emelfm2_0.0.8.bb
index 3b0f6db..855fcbb 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;apply=yes"
+	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 c833d86..86eae4c 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;apply=yes \
-	file://dont-run-tests.patch;apply=yes \
-	file://configure-remove-dumbness.patch;apply=yes \
-	file://makefile-remove-tools.patch;apply=yes "
+	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 3768e89..7713a9d 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;apply=yes"
+           file://configure.patch"
 
 EXTRA_OECONF = "--with-aspell-prefix=${STAGING_DIR_HOST}${layout_prefix} --enable-aspell --disable-binreloc"
 
diff --git a/recipes/enscript/enscript_1.6.4.bb b/recipes/enscript/enscript_1.6.4.bb
index a3992aa..21c2055 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;apply=yes"
+	   file://autotools.patch"
 
 inherit autotools
 
diff --git a/recipes/erlang/erlang_R11B.1.bb b/recipes/erlang/erlang_R11B.1.bb
index 2a9afc6..a2a30c9 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;apply=yes \
-            file://erts-emulator-Makefile.in.patch;apply=yes \
-            file://erts-etc-unix-Install.src.patch;apply=yes \
-            file://lib-crypto-c_src-Makefile.in.patch;apply=yes \
-            file://lib-erl_interface-src-Makefile.in.patch;apply=yes \
-            file://Makefile.in.patch;apply=yes \
+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 0cf4b78..570b3bb 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;apply=yes \
-            file://erts-etc-unix-Install.src.patch;apply=yes \
-            file://lib-erl_interface-src-Makefile.in.patch;apply=yes \
-            file://Makefile.in.patch;apply=yes \
+            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 1101932..578b6ec 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;apply=yes;name=patch \
-           file://no-docs.patch;apply=yes \
-	   file://configure-fix.patch;apply=yes"
+	   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 5dc0fad..701a19c 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;apply=yes \
-           file://configure.patch;apply=yes "
+           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 7530d4c..3cda4a4 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;apply=yes"
+          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 07cb416..50650a4 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;apply=yes"
+          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 dd6acef..7d3ec11 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;apply=yes;striplevel=0 \
-           file://no-help-dir.patch;apply=yes"
+           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 60f5023..d3487a0 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;apply=yes;striplevel=0 \
-           file://no-help-dir.patch;apply=yes"
+           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 4081013..aa50c75 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;apply=yes;striplevel=0 \
-            file://no-help-dir.patch;apply=yes"
+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 504377f..052e8ca 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;apply=yes"
+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 67d5367..d9d3389 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;apply=yes"
+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 90e887d..f3dcace 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;apply=yes"
+SRC_URI += " file://no-help-dir.patch"
 
 EXTRA_OECONF = "  \
                  --enable-thumbnailer \
diff --git a/recipes/expat/expat_1.95.7.bb b/recipes/expat/expat_1.95.7.bb
index 032f8ca..61b2c5d 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;apply=yes \
-	    file://expat-XMLCALL.patch;apply=yes \
+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 b7476fd..db21b67 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;apply=yes"
+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 5a6482e..360e7aa 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;apply=yes \
-	   file://conffile.patch;apply=yes \
-	   file://zoneedit.patch;apply=yes \
-	   file://CVE-2004-0980.patch;apply=yes;striplevel=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 d861249..9b56c24 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;apply=yes \
+  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 c832f50..fba2f55 100644
--- a/recipes/faad2/faad2_2.0.bb
+++ b/recipes/faad2/faad2_2.0.bb
@@ -9,7 +9,7 @@ PR ="r2"
 inherit autotools
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/faac/${PN}-${PV}.zip \
-           file://faad2-gcc-fix.patch;apply=yes \
+           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 9c64b44..5b76b0b 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;apply=yes"
+           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 62aa454..915886b 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;apply=yes"
+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 38aead0..ceaaddf 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;apply=yes "
+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 89a235f..f0f00f3 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;apply=yes \
+  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 7f87f74..a25f2b2 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;apply=yes"
+           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 b8f354d..6feae81 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;apply=yes"
+	   file://rpcsvc.patch"
 
 inherit autotools
 
diff --git a/recipes/fam/fam_2.7.0.bb b/recipes/fam/fam_2.7.0.bb
index d93d144..cca3915 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;apply=yes"
+	   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 a9de324..7915107 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;apply=yes \
-file://cstdio.patch;apply=yes "
+file://link-against-math.patch \
+file://cstdio.patch "
 
 S=${WORKDIR}/fcgi-${PV}
 
diff --git a/recipes/fbgetty/fbgetty_0.1.698.bb b/recipes/fbgetty/fbgetty_0.1.698.bb
index eb2e7db..f00bbab 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;apply=yes"
+	   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 d507329..891657a 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;apply=yes \
-	   http://people.openezx.org/ao2/fbgrab_network_mode.diff;apply=yes;name=patch \
-	   file://fbgrab_1bpp.patch;apply=yes \
+           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 2e12759..886fe81 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;apply=yes \
-	   file://fbi.c.patch;apply=yes \
-	   file://GNUmakefile.patch;apply=yes \
-	   file://sys_siglist.patch;apply=yes \
+	   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 7dd753e..f2af419 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;apply=yes "
+           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 efcb6f2..acaa8e5 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;apply=yes"
+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 2639974..62ec9f2 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;apply=yes"
+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 9863504..011f764 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;apply=yes"
+	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 656a809..9bee0c0 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;apply=yes"
+	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 3b5b6f7..50e27c5 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;apply=yes \
-	   file://480x640-buildfix.patch;apply=yes"
+	   file://fbreader-0.8.2a_buildsys_oe.patch \
+	   file://480x640-buildfix.patch"
 	   
 SRC_URI_append_spitz = "\
-		  file://zaurus-VGA.patch;apply=yes"
+		  file://zaurus-VGA.patch"
 
 SRC_URI_append_akita = "\
-		  file://zaurus-VGA.patch;apply=yes"
+		  file://zaurus-VGA.patch"
 
 SRC_URI_append_htcuniversal = "\
-		  file://zaurus-VGA.patch;apply=yes"
+		  file://zaurus-VGA.patch"
 
 # Set the defaults
 READER_RESOLUTION = "240x320"
diff --git a/recipes/fbset/fbset_2.1.bb b/recipes/fbset/fbset_2.1.bb
index 0d8fa1f..e1bbd57 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;apply=yes"
+           file://makefile.patch"
 
 inherit autotools update-alternatives
 
diff --git a/recipes/fbv/fbv_1.0b.bb b/recipes/fbv/fbv_1.0b.bb
index 3e62c94..2e2d7ba 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;apply=yes \
-	file://fbv-1.0b.patch;apply=yes \
+	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 a17f2a9..85b4301 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;apply=yes;striplevel=0 \
+	   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 7e10458..5077053 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;apply=yes"
+	   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 f848c49..598a3f6 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;apply=yes"
+	   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 c29982b..31268ed 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;apply=yes"
+	   file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/fetchmail/fetchmail_6.2.5.bb b/recipes/fetchmail/fetchmail_6.2.5.bb
index d9c372d..de2af94 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;apply=yes"
+	   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 36d8364..4b2bd0f 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;apply=yes;striplevel=0 \
-			file://atd-startup-restart.patch;apply=yes;striplevel=0 \
-			file://atd-alarm-glue.patch;apply=yes;striplevel=0 \
-			file://atd-over-fso.conf.patch;apply=yes;striplevel=0 \
-			file://run-over-fso.patch;apply=yes"
+			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/ffmpeg/ffmpeg_0.4.9-pre1.bb b/recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb
index 63bfde1..1ac8610 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;apply=yes \
-           file://gcc4.patch;apply=yes \
-           file://soname.patch;apply=yes \
-	   file://Makefile-avformat-use-LDFLAGS.patch;apply=yes \
-           file://Makefile-add-liblame.patch;apply=yes \
-           file://install-must-not-strip.patch;apply=yes \
+           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 62bedaf..d24ff14 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;apply=yes \
-       file://ffmpeg-arm-update.diff;apply=yes \
+	   file://armv4.patch \
+       file://ffmpeg-arm-update.diff \
 	  "
 
 #S = "${WORKDIR}/git"
diff --git a/recipes/ffmpeg/omapfbplay_git.bb b/recipes/ffmpeg/omapfbplay_git.bb
index abbc0df..29b851a 100644
--- a/recipes/ffmpeg/omapfbplay_git.bb
+++ b/recipes/ffmpeg/omapfbplay_git.bb
@@ -8,7 +8,7 @@ PV = "0.0+${PR}+gitr${SRCREV}"
 
 SRCREV = "26df4208b57ccb0f0ca101ae4ddb92c956a0ecc0"
 SRC_URI = "git://git.mansr.com/${PN};protocol=git \
-           file://fbplay-static.diff;apply=yes "
+           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 285c722..2833021 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;apply=yes"
+	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 2ebe549..08b627a 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;apply=yes"
+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 9f31a7e..6f16e3c 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;apply=yes"
+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 309abc9..2752db7 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;apply=yes \
+	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 0f4d19d..e278bee 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;apply=yes"
+SRC_URI += "file://mkinstalldirs.patch"
 
 EXTRA_OECONF += " ac_cv_path_SORT=/usr/bin/sort "
 
diff --git a/recipes/flac/flac_1.1.0.bb b/recipes/flac/flac_1.1.0.bb
index cd1d326..32e5e75 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;apply=yes"
+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 3b01aa7..3927f7d 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;apply=yes"
+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 b307a85..b192424 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;apply=yes;striplevel=0 \
-            file://flac-printf-format-fix.diff;apply=yes;striplevel=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 84c10f8..f8aed83 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;apply=yes \
+	file://makefile-disable-strip.patch \
 	"
 
 S = "${WORKDIR}/${PN}"
diff --git a/recipes/flex/flex_2.5.31.bb b/recipes/flex/flex_2.5.31.bb
index 6710717..b7cb0f7 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;apply=yes \
-           file://fix-gen.patch;apply=yes \
-           file://include.patch;apply=yes"
+           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 f464a0b..a62ee16 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;apply=yes \  # 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;apply=yes"
+           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 b43a17f..9db0629 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;apply=yes \   # 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;apply=yes \
-           file://flite-alsa-1.3-configure-with-audio.patch;apply=yes"
+           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 202aaa9..3d9a2f5 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;apply=yes \
-           file://configure-with-audio.patch;apply=yes"
+           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 60df00a..6060b12 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;apply=yes \
-#          file://flite-1.3-fix-read-only-assignments.patch;apply=yes \  # fixed elsewhere in 1.3 release?
-           file://flite-1.3-configure-with-audio.patch;apply=yes"
+           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 2fd3129..5172aa3 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;apply=yes"
+	   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 119881e..2da7ae0 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;apply=yes"
+           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 547e3ea..97599d7 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;apply=yes \
+  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 0a0ed4a..085d8e6 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;apply=yes \
-#       http://ftp.de.debian.org/debian/pool/main/f/fltk1.1/fltk1.1_1.1.10-2.diff.gz;apply=yes \
+	   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 82e89ed..c52fb5c 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;apply=yes \
+	   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 ce03604..7bc107f 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;apply=yes \
-           file://no-check-for-python-stuff.patch;apply=yes"
+           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 9d510a4..2d060cc 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;apply=yes"
+           file://makefile.patch"
 
 inherit autotools
 
diff --git a/recipes/fontconfig/fontconfig_2.2.95.bb b/recipes/fontconfig/fontconfig_2.2.95.bb
index 22b396b..bde0c7c 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;apply=yes \
-           file://fc-lang.patch;apply=yes \
+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 75876e1..b099385 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;apply=yes \
-           file://fc-lang.patch;apply=yes \
-           file://one-j-too-many.patch;apply=yes \
+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 f9ca57d..77cb2fa 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;apply=yes"
+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 2eea56c..4b4b128 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;apply=yes "
+	    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 eaf8369..e1c9ced 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;apply=yes"
+           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 92c27ff..51e862d 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;apply=yes \
-	file://forte-0.3.5_timer.patch;apply=yes \
-	file://forte-0.3.5_stdlib_inc_fix.patch;apply=yes"
+	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 94b959e..f787722 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;apply=yes"
+	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 cfad3a7..1c022b8 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;apply=yes;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 35da75e..d73eed4 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;apply=yes \
+	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 59cd517..1d4ab8f 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;apply=yes \
-           file://free42-vga-skin.patch;apply=yes \
-           file://free42-dont-declare-sincos.patch;apply=yes \
+           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/freesmartphone/frameworkd_git.bb b/recipes/freesmartphone/frameworkd_git.bb
index 1abe4cf..395a137 100644
--- a/recipes/freesmartphone/frameworkd_git.bb
+++ b/recipes/freesmartphone/frameworkd_git.bb
@@ -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;apply=yes"
+SRC_URI_append_shr = "file://oeventsd-use-opimd-signals.patch"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/freetype/freetype_2.1.10.bb b/recipes/freetype/freetype_2.1.10.bb
index a0c06fa..9fe742f 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;apply=yes \
-	   file://no-hardcode.patch;apply=yes"
+	   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 58b8d56..b561475 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;apply=yes"
+	   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 714477d..0fb2c9c 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;apply=yes \
-           file://no-hardcode.patch;apply=yes"
+	   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 77bf268..8487eb1 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;apply=yes \
-           file://no-hardcode.patch;apply=yes"
+	   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 1782c5a..a8e3b62 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;apply=yes"
-#           file://no-hardcode.patch;apply=yes"
-#	   file://configure.patch;apply=yes \
+           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
index 32e6500..1474bb9 100644
--- a/recipes/freetype/freetype_2.3.11.bb
+++ b/recipes/freetype/freetype_2.3.11.bb
@@ -5,9 +5,9 @@ PR = "r0"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
-  file://no-hardcode.patch;apply=yes \
-  file://fix-configure.patch;apply=yes \
-  file://libtool-tag.patch;apply=yes \
+  file://no-hardcode.patch \
+  file://fix-configure.patch \
+  file://libtool-tag.patch \
 "
 S = "${WORKDIR}/freetype-${PV}"
 
diff --git a/recipes/freetype/freetype_2.3.4.bb b/recipes/freetype/freetype_2.3.4.bb
index 515594c..136dfbc 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;apply=yes \
-           file://no-hardcode.patch;apply=yes \
+           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 4c81998..eca7e91 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;apply=yes \
-           file://no-hardcode.patch;apply=yes \
+           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 325ee0d..b70bf56 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;apply=yes \
-  file://fix-configure.patch;apply=yes \
-  file://libtool-tag.patch;apply=yes \
+  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 8733bdf..37dda5d 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;apply=yes \
-  file://fix-configure.patch;apply=yes \
-  file://libtool-tag.patch;apply=yes \
+  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 b24f900..daf2d51 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;apply=yes \
-           file://frodo-joystick-4state.diff;apply=yes \
+           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 240b6cb..4bc3b39 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;apply=yes \
+           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 cc9ac49..f102305 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;apply=yes "
+	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 045b860..3a28295 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;apply=yes \
-	file://remove_root_restriction.patch;apply=yes "
+	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 f12120c..2ac3009 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;apply=yes \
-	file://Makefile.patch;apply=yes \
-	file://Makefile.PL.patch;apply=yes"
+	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 c501fc0..8ed505e 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;apply=yes \
-	   file://Makefile.patch;apply=yes \
-	   file://Makefile_top.patch;apply=yes \
-	   file://localespath-fix.patch;apply=yes \
+	   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 bf192fe..504f652 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;apply=yes \
-	   file://usb-header-name-2-6-23.patch;apply=yes \
+	   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 14c5c0c..0e28207 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;apply=yes"
+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 a49ef32..5cc2616 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;apply=yes"
+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 ece5a36..aae5441 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;apply=yes"
+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 e3d2b15..27a23dc 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;apply=yes"
+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 3401ba0..b214af0 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;apply=yes \
-	   file://install.patch;apply=yes \
-	   file://paths.patch;apply=yes"
+	   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 6f26f2f..cccda60 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;apply=yes \
-	file://upstream-configure.ac.patch;apply=yes \
-	file://acinclude.m4.patch;apply=yes \
+	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 d02001a..5d5cf31 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;apply=yes"
+           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 f47bbb8..8d8b32d 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;apply=yes \
-	file://forward-decl.patch;apply=yes \
+	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 4daf089..03c6bdc 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;apply=yes \
-	file://forward-decl.patch;apply=yes \
+	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 a41e4fa..e42f6e8 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;apply=yes"
-#           file://no-check.patch;apply=yes"
+           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 151c0fa..84c0885 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;apply=yes"
+           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 93331d0..8c1ef61 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;apply=yes"
+		 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 3bf5815..8888c9a 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;apply=yes \
-        file://Makefile.am.patch;apply=yes \
-        file://src-ui.c.patch;apply=yes;striplevel=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 0397e5d..392e3c3 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;apply=yes"
+           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 f2f4735..7d76b90 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;apply=yes \
-           file://configure_ucred.patch;apply=yes "
+           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 64a84fc..1755237 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;apply=yes"
+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 08fcc59..5fc088e 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;apply=yes"
+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 2f15fd2..0b5db62 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;apply=yes"
+        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 3ae47f3..695af62 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;apply=yes \
-	   file://empty6.patch;apply=yes \
-	   file://pr10392-1-test.patch;apply=yes \
-	   file://pr10412-1-test.patch;apply=yes \
-	   file://pr10589-1-test.patch;apply=yes \
-	   file://pr11162-1-test.patch;apply=yes \
-	   file://pr11587-1-test.patch;apply=yes \
-	   file://pr11608.patch;apply=yes \
-	   file://pr11736-1-test.patch;apply=yes \
-	   file://pr11864-1-test.patch;apply=yes \
-	   file://pr12009.patch;apply=yes \
-	   file://pr12010.patch;apply=yes \
-	   file://pr13260-test.patch;apply=yes \
-	   file://pr9365-1-test.patch;apply=yes \
-	   file://sh-lib1funcs_sizeAndType.patch;apply=yes \
-	   file://sh-pic-set_fpscr-gcc-3.3.2.patch;apply=yes \
-	   file://thunk3.patch;apply=yes \
+	   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;apply=yes;striplevel=0 \
-	   file://arm-xscale.patch;apply=yes;striplevel=0 \
-	   file://arm-14302.patch;apply=yes;striplevel=0 \
-	   file://arm-ldm-peephole.patch;apply=yes;striplevel=0 \
-	   file://libibery-crosstool.patch;apply=yes \
-	   file://reverse-compare.patch;apply=yes \
-	   file://gcc34-15089.patch;apply=yes \
-	file://gcc-uclibc-3.3-100-conf.patch;apply=yes \
-	file://gcc-uclibc-3.3-110-conf.patch;apply=yes \
-	file://gcc-uclibc-3.3-120-softfloat.patch;apply=yes \
-	file://gcc-uclibc-3.3-200-code.patch;apply=yes \
-	file://zecke-xgcc-cpp.patch;apply=yes \
-	file://bash3.patch;apply=yes"
+	   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 1ad52f5..8ec9dc0 100644
--- a/recipes/gcc/gcc-3.3.4.inc
+++ b/recipes/gcc/gcc-3.3.4.inc
@@ -5,18 +5,18 @@ INC_PR = "r11"
 SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
 	   file://arm-gotoff.dpatch;apply=yes;striplevel=0 \
 	   file://arm-ldm.dpatch;apply=yes;striplevel=0 \
-	   file://arm-tune.patch;apply=yes;striplevel=0 \
-	   file://arm-ldm-peephole.patch;apply=yes;striplevel=0 \
-	   file://libibery-crosstool.patch;apply=yes \
-	   file://reverse-compare.patch;apply=yes \
-	   file://gcc34-15089.patch;apply=yes \
-	   file://gcc-uclibc-3.3-100-conf.patch;apply=yes \
-	   file://gcc-uclibc-3.3-110-conf.patch;apply=yes \
-	   file://gcc-uclibc-3.3-120-softfloat.patch;apply=yes \
-	   file://gcc-uclibc-3.3-200-code.patch;apply=yes \
-	   file://zecke-xgcc-cpp.patch;apply=yes \
-	   file://gcc-com.patch;apply=yes \
-	   file://bash3.patch;apply=yes"
+	   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 b1da0e1..d3823b3 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;apply=yes \
-	   file://gcc34-arm-ldm.patch;apply=yes \
-	   file://gcc34-arm-ldm-peephole.patch;apply=yes \
-	   file://gcc34-arm-tune.patch;apply=yes \
-	   file://gcc-3.4.1-uclibc-100-conf.patch;apply=yes \
-	   file://gcc-3.4.1-uclibc-200-locale.patch;apply=yes \
-	   file://gcc-3.4.0-arm-lib1asm.patch;apply=yes \
-	   file://gcc-3.4.0-arm-nolibfloat.patch;apply=yes \
-	   file://gcc-3.4.0-arm-bigendian.patch;apply=yes \
-	   file://gcc-3.4.0-arm-bigendian-uclibc.patch;apply=yes \
-	   file://GCC3.4.0VisibilityPatch.diff;apply=yes \
-	   file://15342.patch;apply=yes \
-	   file://always-fixincperm.patch;apply=yes \
-	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;apply=yes \
-	   file://zecke-xgcc-cpp.patch;apply=yes "
+	   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 ef2cc8d..b63f59e 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;apply=yes \
-	   file://gcc34-arm-ldm.patch;apply=yes \
-	   file://gcc34-arm-ldm-peephole.patch;apply=yes \
-	   file://gcc34-arm-tune.patch;apply=yes \
-	   file://gcc-3.4.1-uclibc-100-conf.patch;apply=yes \
-	   file://gcc-3.4.1-uclibc-200-locale.patch;apply=yes \
-	   file://gcc-3.4.0-arm-lib1asm.patch;apply=yes \
-	   file://gcc-3.4.0-arm-nolibfloat.patch;apply=yes \
-	   file://gcc-3.4.0-arm-bigendian.patch;apply=yes \
-	   file://gcc-3.4.0-arm-bigendian-uclibc.patch;apply=yes \
-	   file://GCC3.4.0VisibilityPatch.diff;apply=yes \
-	   file://15342.patch;apply=yes \
-	   file://jarfix.patch;apply=yes \
-	   file://always-fixincperm.patch;apply=yes \
-	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;apply=yes \
-	   file://zecke-xgcc-cpp.patch;apply=yes \
-	   file://gcc-libgcc2-inhibit-libc.patch;apply=yes \
-	   file://gcc4-mtune-compat.patch;apply=yes \
-	   file://gcc34-configure.in.patch;apply=yes \
-	   file://gcc34-thumb-support.patch;apply=yes \
-	   file://gcc-cross-fixincl.patch;apply=yes \
-	   file://gcc-posix-open-fix.patch;apply=yes \
+	   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;apply=yes "
+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 529992a..b6b01e3 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;apply=yes \
-	   file://gcc34-arm-ldm.patch;apply=yes \
-	   file://gcc34-arm-ldm-peephole.patch;apply=yes \
-	   file://gcc34-arm-tune.patch;apply=yes \
-	   file://gcc-3.4.1-uclibc-100-conf.patch;apply=yes \
-	   file://gcc-3.4.1-uclibc-200-locale.patch;apply=yes \
-	   file://gcc-3.4.0-arm-lib1asm.patch;apply=yes \
-	   file://gcc-3.4.0-arm-nolibfloat.patch;apply=yes \
-	   file://gcc-3.4.0-arm-bigendian.patch;apply=yes \
-	   file://gcc-3.4.0-arm-bigendian-uclibc.patch;apply=yes \
-	   file://GCC3.4.0VisibilityPatch.diff;apply=yes \
-	   file://jarfix.patch;apply=yes \
-	   file://always-fixincperm.patch;apply=yes \
-	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;apply=yes \
-	   file://zecke-xgcc-cpp.patch;apply=yes \
-	   file://gcc-posix-open-fix.patch;apply=yes \
-	   file://gcc4-mtune-compat.patch;apply=yes"
+	   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;apply=yes"
-SRC_URI += "file://gcc34-thumb-support.patch;apply=yes"
-SRC_URI_append = " file://zecke-no-host-includes.patch;apply=yes "
+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 b6bf325..dd48595 100644
--- a/recipes/gcc/gcc-4.0.0.inc
+++ b/recipes/gcc/gcc-4.0.0.inc
@@ -4,9 +4,9 @@ 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;apply=yes \
-	file://zecke-xgcc-cpp.patch;apply=yes"
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;apply=yes "
+	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"
diff --git a/recipes/gcc/gcc-4.0.2.inc b/recipes/gcc/gcc-4.0.2.inc
index 4e2a508..16584ec 100644
--- a/recipes/gcc/gcc-4.0.2.inc
+++ b/recipes/gcc/gcc-4.0.2.inc
@@ -4,24 +4,24 @@ 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;apply=yes \
-	file://arm-nolibfloat.patch;apply=yes \
-	file://arm-softfloat.patch;apply=yes \
-	file://GCOV_PREFIX_STRIP-cross-profile_4.1.patch;apply=yes \
-	file://zecke-xgcc-cpp.patch;apply=yes "
+	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;apply=yes   \
-                   file://200-uclibc-locale.patch;apply=yes \
-                   file://301-missing-execinfo_h.patch;apply=yes \
-                   file://302-c99-snprintf.patch;apply=yes  \
-                   file://303-c99-complex-ugly-hack.patch;apply=yes \
-                   file://800-arm-bigendian.patch;apply=yes \
-                   file://zecke-host-cpp-ac-hack.patch;apply=yes \
-		   file://gcc-4.0.2-atmel.0.99.2.patch;apply=yes \
+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;apply=yes "
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch "
 
 # Language Overrides
 FORTRAN = ""
diff --git a/recipes/gcc/gcc-4.1.0.inc b/recipes/gcc/gcc-4.1.0.inc
index fcba6b6..bfaf699 100644
--- a/recipes/gcc/gcc-4.1.0.inc
+++ b/recipes/gcc/gcc-4.1.0.inc
@@ -8,12 +8,12 @@ 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;apply=yes \
-	file://arm-softfloat.patch;apply=yes \
-	file://zecke-xgcc-cpp.patch;apply=yes \
-    file://pr34130.patch;apply=yes"
+	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;apply=yes "
+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"
diff --git a/recipes/gcc/gcc-4.1.1.inc b/recipes/gcc/gcc-4.1.1.inc
index 03ab77a..3b813b0 100644
--- a/recipes/gcc/gcc-4.1.1.inc
+++ b/recipes/gcc/gcc-4.1.1.inc
@@ -6,40 +6,40 @@ 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;apply=yes \
-	file://110-arm-eabi.patch;apply=yes \
-	file://200-uclibc-locale.patch;apply=yes \
-	file://300-libstdc++-pic.patch;apply=yes \
-	file://301-missing-execinfo_h.patch;apply=yes \
-	file://302-c99-snprintf.patch;apply=yes \
-	file://303-c99-complex-ugly-hack.patch;apply=yes \
-	file://304-index_macro.patch;apply=yes \
-	file://602-sdk-libstdc++-includes.patch;apply=yes \
-	file://740-sh-pr24836.patch;apply=yes \
-	file://800-arm-bigendian.patch;apply=yes \
-	file://801-arm-bigendian-eabi.patch;apply=yes \
-	file://arm-nolibfloat.patch;apply=yes \
-	file://arm-softfloat.patch;apply=yes \
-	file://gcc41-configure.in.patch;apply=yes \
-	file://arm-thumb.patch;apply=yes \
-	file://arm-thumb-cache.patch;apply=yes \
-	file://cse.patch;apply=yes \
-	file://zecke-xgcc-cpp.patch;apply=yes \
-	file://unbreak-armv4t.patch;apply=yes \
-        file://fix-ICE-in-arm_unwind_emit_set.diff;apply=yes \
-        file://gcc-4.1.1-pr13685-1.patch;apply=yes \
-        file://gcc-ignore-cache.patch;apply=yes \
-        file://gcc-4.1.1-e300cx.patch;apply=yes \
-        file://pr34130.patch;apply=yes \
-	file://sed-fixinc-backslash.patch;apply=yes \
+	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;apply=yes "
+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;apply=yes \
-                         file://ppc-sfp-long-double-gcc411-7.patch;apply=yes "
+SRC_URI_append_linux = " file://ppc-gcc-41-20060515.patch \
+                         file://ppc-sfp-long-double-gcc411-7.patch "
 
 # Language Overrides
 FORTRAN = ""
diff --git a/recipes/gcc/gcc-4.1.2.inc b/recipes/gcc/gcc-4.1.2.inc
index 854eeef..e89a8de 100644
--- a/recipes/gcc/gcc-4.1.2.inc
+++ b/recipes/gcc/gcc-4.1.2.inc
@@ -6,45 +6,45 @@ 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;apply=yes \
-	file://110-arm-eabi.patch;apply=yes \
-	file://200-uclibc-locale.patch;apply=yes \
-	file://300-libstdc++-pic.patch;apply=yes \
-	file://301-missing-execinfo_h.patch;apply=yes \
-	file://302-c99-snprintf.patch;apply=yes \
-	file://303-c99-complex-ugly-hack.patch;apply=yes \
-	file://304-index_macro.patch;apply=yes \
-	file://602-sdk-libstdc++-includes.patch;apply=yes \
-	file://740-sh-pr24836.patch;apply=yes \
-	file://800-arm-bigendian.patch;apply=yes \
-	file://arm-nolibfloat.patch;apply=yes \
-	file://arm-softfloat.patch;apply=yes \
-	file://gcc41-configure.in.patch;apply=yes \
-	file://arm-thumb.patch;apply=yes \
-	file://arm-thumb-cache.patch;apply=yes \
-	file://zecke-xgcc-cpp.patch;apply=yes \
-	file://unbreak-armv4t.patch;apply=yes \
-        file://fix-ICE-in-arm_unwind_emit_set.diff;apply=yes \
-	file://cache-amnesia.patch;apply=yes \
-	file://gfortran.patch;apply=yes \
-        file://gcc-4.0.2-e300c2c3.patch;apply=yes \
-        file://pr34130.patch;apply=yes \
+	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;apply=yes "
+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;apply=yes \
-#           file://200-uclibc-locale.patch;apply=yes \
-#           file://300-libstdc++-pic.patch;apply=yes \
-           file://301-missing-execinfo_h.patch;apply=yes \
-           file://302-c99-snprintf.patch;apply=yes \
-           file://303-c99-complex-ugly-hack.patch;apply=yes \
-           file://304-index_macro.patch;apply=yes \
-           file://602-sdk-libstdc++-includes.patch;apply=yes \
-           file://gcc41-configure.in.patch;apply=yes \
-           file://zecke-xgcc-cpp.patch;apply=yes \
-           file://cache-amnesia.patch;apply=yes \
+#           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() {
diff --git a/recipes/gcc/gcc-4.2.1.inc b/recipes/gcc/gcc-4.2.1.inc
index b02b91f..63876f7 100644
--- a/recipes/gcc/gcc-4.2.1.inc
+++ b/recipes/gcc/gcc-4.2.1.inc
@@ -4,86 +4,86 @@ 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;apply=yes \
-	file://103-uclibc-conf-noupstream.patch;apply=yes \
-	file://200-uclibc-locale.patch;apply=yes \
-	file://203-uclibc-locale-no__x.patch;apply=yes \
-	file://204-uclibc-locale-wchar_fix.patch;apply=yes \
-	file://205-uclibc-locale-update.patch;apply=yes \
-	file://300-libstdc++-pic.patch;apply=yes \
-	file://301-missing-execinfo_h.patch;apply=yes \
-	file://302-c99-snprintf.patch;apply=yes \
-	file://303-c99-complex-ugly-hack.patch;apply=yes \
-	file://304-index_macro.patch;apply=yes \
-	file://305-libmudflap-susv3-legacy.patch;apply=yes \
-	file://306-libstdc++-namespace.patch;apply=yes \
-	file://307-locale_facets.patch;apply=yes \
-	file://402-libbackend_dep_gcov-iov.h.patch;apply=yes \
-	file://602-sdk-libstdc++-includes.patch;apply=yes \
-	file://740-sh-pr24836.patch;apply=yes \
-	file://800-arm-bigendian.patch;apply=yes \
-	file://904-flatten-switch-stmt-00.patch;apply=yes \
-	file://arm-nolibfloat.patch;apply=yes \
-	file://arm-softfloat.patch;apply=yes \
-	file://gcc41-configure.in.patch;apply=yes \
-	file://arm-thumb.patch;apply=yes \
-	file://arm-thumb-cache.patch;apply=yes \
-	file://zecke-xgcc-cpp.patch;apply=yes \
-	file://unbreak-armv4t.patch;apply=yes \
-	file://cache-amnesia.patch;apply=yes \
-	file://gfortran.patch;apply=yes \
-	file://pr34130.patch;apply=yes \
+	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;apply=yes \
-        file://100-uclibc-conf.patch;apply=yes \
-        file://103-uclibc-conf-noupstream.patch;apply=yes \
-        file://200-uclibc-locale.patch;apply=yes \
-        file://203-uclibc-locale-no__x.patch;apply=yes \
-        file://204-uclibc-locale-wchar_fix.patch;apply=yes \
-        file://205-uclibc-locale-update.patch;apply=yes \
-        file://300-libstdc++-pic.patch;apply=yes \
-        file://301-missing-execinfo_h.patch;apply=yes \
-        file://302-c99-snprintf.patch;apply=yes \
-        file://303-c99-complex-ugly-hack.patch;apply=yes \
-        file://304-index_macro.patch;apply=yes \
-        file://305-libmudflap-susv3-legacy.patch;apply=yes \
-        file://306-libstdc++-namespace.patch;apply=yes \
-        file://307-locale_facets.patch;apply=yes \
-        file://402-libbackend_dep_gcov-iov.h.patch;apply=yes \
-        file://602-sdk-libstdc++-includes.patch;apply=yes \
-        file://740-sh-pr24836.patch;apply=yes \
-        file://904-flatten-switch-stmt-00.patch;apply=yes \
-        file://gcc41-configure.in.patch;apply=yes \
-        file://zecke-xgcc-cpp.patch;apply=yes \
-        file://cache-amnesia.patch;apply=yes \
-        file://gfortran.patch;apply=yes \
+        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;apply=yes \
-        file://arm-crunch-20000320.patch;apply=yes \
-        file://arm-crunch-compare.patch;apply=yes \
-        file://arm-crunch-compare-unordered.patch;apply=yes \
-        file://arm-crunch-compare-geu.patch;apply=yes \
-        file://arm-crunch-eabi-ieee754.patch;apply=yes \
-        file://arm-crunch-eabi-ieee754-div.patch;apply=yes \
-        file://arm-crunch-64bit-disable0.patch;apply=yes \
-        file://arm-crunch-offset.patch;apply=yes \
-        file://arm-crunch-fp_consts.patch;apply=yes \
-        file://arm-crunch-neg2.patch;apply=yes \
-        file://arm-crunch-predicates3.patch;apply=yes \
-        file://arm-crunch-cfcvtds-disable.patch;apply=yes \
-        file://arm-crunch-floatsi-disable.patch;apply=yes \
-        file://arm-crunch-truncsi-disable.patch;apply=yes \
-        file://arm-crunch-cfcvt64-disable.patch;apply=yes \
-        file://arm-crunch-cirrus-bugfixes.patch;apply=yes \
+        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;apply=yes "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
 
 # Language Overrides
 FORTRAN = ""
diff --git a/recipes/gcc/gcc-4.2.2.inc b/recipes/gcc/gcc-4.2.2.inc
index e343137..2a5334a 100644
--- a/recipes/gcc/gcc-4.2.2.inc
+++ b/recipes/gcc/gcc-4.2.2.inc
@@ -7,73 +7,73 @@ 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;apply=yes \
-	file://103-uclibc-conf-noupstream.patch;apply=yes \
-	file://200-uclibc-locale.patch;apply=yes \
-	file://203-uclibc-locale-no__x.patch;apply=yes \
-	file://204-uclibc-locale-wchar_fix.patch;apply=yes \
-	file://205-uclibc-locale-update.patch;apply=yes \
-	file://300-libstdc++-pic.patch;apply=yes \
-	file://301-missing-execinfo_h.patch;apply=yes \
-	file://302-c99-snprintf.patch;apply=yes \
-	file://303-c99-complex-ugly-hack.patch;apply=yes \
-	file://304-index_macro.patch;apply=yes \
-	file://305-libmudflap-susv3-legacy.patch;apply=yes \
-	file://306-libstdc++-namespace.patch;apply=yes \
-	file://307-locale_facets.patch;apply=yes \
-	file://402-libbackend_dep_gcov-iov.h.patch;apply=yes \
-	file://602-sdk-libstdc++-includes.patch;apply=yes \
-	file://740-sh-pr24836.patch;apply=yes \
-	file://800-arm-bigendian.patch;apply=yes \
-	file://801-arm-bigendian-eabi.patch;apply=yes \
-	file://904-flatten-switch-stmt-00.patch;apply=yes \
-	file://arm-nolibfloat.patch;apply=yes \
-	file://arm-softfloat.patch;apply=yes \
-	file://gcc41-configure.in.patch;apply=yes \
-	file://arm-thumb.patch;apply=yes \
-	file://arm-thumb-cache.patch;apply=yes \
-	file://zecke-xgcc-cpp.patch;apply=yes \
-	file://unbreak-armv4t.patch;apply=yes \
-	file://cache-amnesia.patch;apply=yes \
-	file://gfortran.patch;apply=yes \
-	file://gcc-4.0.2-e300c2c3.patch;apply=yes \
-	file://pr34130.patch;apply=yes \
-	file://fortran-static-linking.patch;apply=yes \
-	file://intermask-bigendian.patch;apply=yes \
+	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;apply=yes \
-	file://901-avr32-fix-no-cond-exec-before-reload.patch;apply=yes \
-	file://902-avr32-fix-sync-insn-instructions.patch;apply=yes \
-	file://903-avr32-fix-removal-of-redundant-cast-operations.patch;apply=yes \
+        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;apply=yes \
-        file://arm-crunch-20000320.patch;apply=yes \
-        file://arm-crunch-compare.patch;apply=yes \
-        file://arm-crunch-compare-unordered.patch;apply=yes \
-        file://arm-crunch-compare-geu.patch;apply=yes \
-        file://arm-crunch-eabi-ieee754.patch;apply=yes \
-        file://arm-crunch-eabi-ieee754-div.patch;apply=yes \
-        file://arm-crunch-64bit-disable0.patch;apply=yes \
-        file://arm-crunch-offset.patch;apply=yes \
-        file://arm-crunch-fp_consts.patch;apply=yes \
-        file://arm-crunch-neg2.patch;apply=yes \
-        file://arm-crunch-predicates3.patch;apply=yes \
-        file://arm-crunch-cfcvtds-disable.patch;apply=yes \
-        file://arm-crunch-floatsi-disable.patch;apply=yes \
-        file://arm-crunch-truncsi-disable.patch;apply=yes \
-        file://arm-crunch-cfcvt64-disable.patch;apply=yes \
-        file://arm-crunch-cirrus-bugfixes.patch;apply=yes \
+        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;apply=yes "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
 
 # Language Overrides
 FORTRAN = ""
diff --git a/recipes/gcc/gcc-4.2.3.inc b/recipes/gcc/gcc-4.2.3.inc
index 76949a6..e947cba 100644
--- a/recipes/gcc/gcc-4.2.3.inc
+++ b/recipes/gcc/gcc-4.2.3.inc
@@ -7,63 +7,63 @@ 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;apply=yes \
-	file://103-uclibc-conf-noupstream.patch;apply=yes \
-	file://200-uclibc-locale.patch;apply=yes \
-	file://203-uclibc-locale-no__x.patch;apply=yes \
-	file://204-uclibc-locale-wchar_fix.patch;apply=yes \
-	file://205-uclibc-locale-update.patch;apply=yes \
-	file://300-libstdc++-pic.patch;apply=yes \
-	file://301-missing-execinfo_h.patch;apply=yes \
-	file://302-c99-snprintf.patch;apply=yes \
-	file://303-c99-complex-ugly-hack.patch;apply=yes \
-	file://304-index_macro.patch;apply=yes \
-	file://305-libmudflap-susv3-legacy.patch;apply=yes \
-	file://306-libstdc++-namespace.patch;apply=yes \
-	file://307-locale_facets.patch;apply=yes \
-	file://402-libbackend_dep_gcov-iov.h.patch;apply=yes \
-	file://602-sdk-libstdc++-includes.patch;apply=yes \
-	file://740-sh-pr24836.patch;apply=yes \
-	file://800-arm-bigendian.patch;apply=yes \
-	file://801-arm-bigendian-eabi.patch;apply=yes \
-	file://904-flatten-switch-stmt-00.patch;apply=yes \
-	file://arm-nolibfloat.patch;apply=yes \
-	file://arm-softfloat.patch;apply=yes \
-	file://gcc41-configure.in.patch;apply=yes \
-	file://arm-thumb.patch;apply=yes \
-	file://arm-thumb-cache.patch;apply=yes \
-	file://zecke-xgcc-cpp.patch;apply=yes \
-	file://unbreak-armv4t.patch;apply=yes \
-	file://cache-amnesia.patch;apply=yes \
-	file://gfortran.patch;apply=yes \
-	file://gcc-4.0.2-e300c2c3.patch;apply=yes \
-	file://fortran-static-linking.patch;apply=yes \
-	file://intermask-bigendian.patch;apply=yes \
+	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;apply=yes \
-        file://arm-crunch-20000320.patch;apply=yes \
-        file://arm-crunch-compare.patch;apply=yes \
-        file://arm-crunch-compare-unordered.patch;apply=yes \
-        file://arm-crunch-compare-geu.patch;apply=yes \
-        file://arm-crunch-eabi-ieee754.patch;apply=yes \
-        file://arm-crunch-eabi-ieee754-div.patch;apply=yes \
-        file://arm-crunch-64bit-disable0.patch;apply=yes \
-        file://arm-crunch-offset.patch;apply=yes \
-        file://arm-crunch-fp_consts.patch;apply=yes \
-        file://arm-crunch-neg2.patch;apply=yes \
-        file://arm-crunch-predicates3.patch;apply=yes \
-        file://arm-crunch-cfcvtds-disable.patch;apply=yes \
-        file://arm-crunch-floatsi-disable.patch;apply=yes \
-        file://arm-crunch-truncsi-disable.patch;apply=yes \
-        file://arm-crunch-cfcvt64-disable.patch;apply=yes \
-        file://arm-crunch-cirrus-bugfixes.patch;apply=yes \
+        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;apply=yes "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
 
 # Language Overrides
 FORTRAN = ""
diff --git a/recipes/gcc/gcc-4.2.4.inc b/recipes/gcc/gcc-4.2.4.inc
index 261f10e..d2a6b3e 100644
--- a/recipes/gcc/gcc-4.2.4.inc
+++ b/recipes/gcc/gcc-4.2.4.inc
@@ -7,75 +7,75 @@ 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;apply=yes \
-	file://103-uclibc-conf-noupstream.patch;apply=yes \
-	file://200-uclibc-locale.patch;apply=yes \
-	file://203-uclibc-locale-no__x.patch;apply=yes \
-	file://204-uclibc-locale-wchar_fix.patch;apply=yes \
-	file://205-uclibc-locale-update.patch;apply=yes \
-	file://300-libstdc++-pic.patch;apply=yes \
-	file://301-missing-execinfo_h.patch;apply=yes \
-	file://302-c99-snprintf.patch;apply=yes \
-	file://303-c99-complex-ugly-hack.patch;apply=yes \
-	file://304-index_macro.patch;apply=yes \
-	file://305-libmudflap-susv3-legacy.patch;apply=yes \
-	file://306-libstdc++-namespace.patch;apply=yes \
-	file://307-locale_facets.patch;apply=yes \
-	file://402-libbackend_dep_gcov-iov.h.patch;apply=yes \
-	file://602-sdk-libstdc++-includes.patch;apply=yes \
-	file://740-sh-pr24836.patch;apply=yes \
-	file://800-arm-bigendian.patch;apply=yes \
-	file://801-arm-bigendian-eabi.patch;apply=yes \
-	file://904-flatten-switch-stmt-00.patch;apply=yes \
-	file://arm-nolibfloat.patch;apply=yes \
-	file://arm-softfloat.patch;apply=yes \
-	file://gcc41-configure.in.patch;apply=yes \
-	file://arm-thumb.patch;apply=yes \
-	file://arm-thumb-cache.patch;apply=yes \
-	file://zecke-xgcc-cpp.patch;apply=yes \
-	file://unbreak-armv4t.patch;apply=yes \
-	file://cache-amnesia.patch;apply=yes \
-	file://gfortran.patch;apply=yes \
-	file://gcc-4.0.2-e300c2c3.patch;apply=yes \
-	file://fortran-static-linking.patch;apply=yes \
-	file://intermask-bigendian.patch;apply=yes \
+	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;apply=yes \
-        file://ep93xx/arm-crunch-saveregs.patch;apply=yes \
-        file://ep93xx/arm-crunch-scratch.patch;apply=yes \
-        file://ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch;apply=yes \
-        file://ep93xx/arm-crunch-eabi-mvf0-scratch-ieee754.patch;apply=yes \
-        file://ep93xx/arm-crunch-20000320.patch;apply=yes \
-        file://ep93xx/arm-crunch-disable-cmpdi.patch;apply=yes \
-        file://ep93xx/arm-crunch-fix-64bit-const-offsets.patch;apply=yes \
-        file://ep93xx/arm-crunch-fp_consts.patch;apply=yes \
-        file://ep93xx/arm-crunch-neg-enable.patch;apply=yes \
-        file://ep93xx/arm-crunch-neg-protect.patch;apply=yes \
-        file://ep93xx/arm-crunch-repair-truncxfsi.patch;apply=yes \
-        file://ep93xx/arm-crunch-floatsi-no-scratch.patch;apply=yes \
-        file://ep93xx/arm-crunch-movsf-movdf-Uy.patch;apply=yes \
-        file://ep93xx/arm-crunch-drop-thumb2.patch;apply=yes \
-        file://ep93xx/arm-crunch-arm_dbx_register_number.patch;apply=yes \
-        file://ep93xx/arm-crunch-pipeline.patch;apply=yes \
-        file://ep93xx/arm-crunch-ccmav-mode.patch;apply=yes \
-        file://ep93xx/arm-crunch-cfcpy-with-cfsh64.patch;apply=yes \
-        file://ep93xx/arm-crunch-mieee.patch;apply=yes \
-        file://ep93xx/arm-size-bugfix.patch;apply=yes \
-        file://ep93xx/arm-prologue_use-length.patch;apply=yes \
-        file://ep93xx/arm-crunch-cftruncd32-attr.patch;apply=yes \
-        file://ep93xx/arm-crunch-fix-cirrus-reorg7.patch;apply=yes \
-        file://ep93xx/arm-crunch-cirrus-di-flag.patch;apply=yes \
-        file://ep93xx/arm-crunch-disable-floatsi.patch;apply=yes \
+        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;apply=yes "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
 
-SRC_URI_append_sh4  = " file://sh_unwind.patch;apply=yes \
-			file://cppdefault_cross.patch;apply=yes \
+SRC_URI_append_sh4  = " file://sh_unwind.patch \
+			file://cppdefault_cross.patch \
 		      "
 
 
diff --git a/recipes/gcc/gcc-4.3.1.inc b/recipes/gcc/gcc-4.3.1.inc
index 704a7ec..3352868 100644
--- a/recipes/gcc/gcc-4.3.1.inc
+++ b/recipes/gcc/gcc-4.3.1.inc
@@ -11,60 +11,60 @@ 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;apply=yes;striplevel=0 \
-	file://fedora/gcc43-ia64-libunwind.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-java-nomulti.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-ppc32-retaddr.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-pr27898.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-pr32139.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-pr33763.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-rh330771.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-rh341221.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-cpp-pragma.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-java-debug-iface-type.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-libgomp-speedup.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-i386-libgomp.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-rh251682.patch;apply=yes;striplevel=0 \
+	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;apply=yes \
-	file://103-uclibc-conf-noupstream.patch;apply=yes \
-	file://200-uclibc-locale.patch;apply=yes \
-	file://203-uclibc-locale-no__x.patch;apply=yes \
-	file://204-uclibc-locale-wchar_fix.patch;apply=yes \
-	file://205-uclibc-locale-update.patch;apply=yes \
-	file://301-missing-execinfo_h.patch;apply=yes \
-	file://302-c99-snprintf.patch;apply=yes \
-	file://303-c99-complex-ugly-hack.patch;apply=yes \
-	file://304-index_macro.patch;apply=yes \
-	file://305-libmudflap-susv3-legacy.patch;apply=yes \
-	file://306-libstdc++-namespace.patch;apply=yes \
-	file://307-locale_facets.patch;apply=yes \
-#	file://402-libbackend_dep_gcov-iov.h.patch;apply=yes \
-	file://602-sdk-libstdc++-includes.patch;apply=yes \
-	file://740-sh-pr24836.patch;apply=yes \
-	file://800-arm-bigendian.patch;apply=yes \
-	file://904-flatten-switch-stmt-00.patch;apply=yes \
-	file://arm-nolibfloat.patch;apply=yes \
-	file://arm-softfloat.patch;apply=yes \
-	file://arm-thumb.patch;apply=yes \
-	file://arm-thumb-cache.patch;apply=yes \
-	file://cache-amnesia.patch;apply=yes \
-	file://gfortran-4.3.x.patch;apply=yes \
-	file://gcc-4.0.2-e300c2c3.patch;apply=yes \
-#	file://pr34130.patch;apply=yes \
-#	file://fortran-static-linking.patch;apply=yes \
-	file://gcc-arm-frename-registers.patch;apply=yes \
-	file://gcc-release-branch/PR-36500-fix-neon.patch;apply=yes \
-	file://gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch;apply=yes \
-	file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;apply=yes \
-	file://zecke-xgcc-cpp.patch;apply=yes \
-	file://gcc-flags-for-build.patch;apply=yes \
+	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;apply=yes "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
 
 # Language Overrides
 FORTRAN = ""
diff --git a/recipes/gcc/gcc-4.3.2.inc b/recipes/gcc/gcc-4.3.2.inc
index 18dc376..897d4f3 100644
--- a/recipes/gcc/gcc-4.3.2.inc
+++ b/recipes/gcc/gcc-4.3.2.inc
@@ -11,59 +11,59 @@ 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;apply=yes;striplevel=0 \
-	file://fedora/gcc43-ia64-libunwind.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-java-nomulti.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-ppc32-retaddr.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-pr27898.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-pr32139.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-pr33763.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-rh330771.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-rh341221.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-cpp-pragma.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-java-debug-iface-type.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-libgomp-speedup.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-i386-libgomp.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-rh251682.patch;apply=yes;striplevel=0 \
+	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;apply=yes \
-	file://103-uclibc-conf-noupstream.patch;apply=yes \
-	file://200-uclibc-locale.patch;apply=yes \
-	file://203-uclibc-locale-no__x.patch;apply=yes \
-	file://204-uclibc-locale-wchar_fix.patch;apply=yes \
-	file://205-uclibc-locale-update.patch;apply=yes \
-	file://301-missing-execinfo_h.patch;apply=yes \
-	file://302-c99-snprintf.patch;apply=yes \
-	file://303-c99-complex-ugly-hack.patch;apply=yes \
-	file://304-index_macro.patch;apply=yes \
-	file://305-libmudflap-susv3-legacy.patch;apply=yes \
-	file://306-libstdc++-namespace.patch;apply=yes \
-	file://307-locale_facets.patch;apply=yes \
-	file://602-sdk-libstdc++-includes.patch;apply=yes \
-	file://740-sh-pr24836.patch;apply=yes \
-	file://800-arm-bigendian.patch;apply=yes \
-	file://904-flatten-switch-stmt-00.patch;apply=yes \
-	file://arm-nolibfloat.patch;apply=yes \
-	file://arm-softfloat.patch;apply=yes \
-	file://cache-amnesia.patch;apply=yes \
-	file://gfortran-4.3.x.patch;apply=yes \
-	file://gcc-4.0.2-e300c2c3.patch;apply=yes \
-#	file://pr34130.patch;apply=yes \
-#	file://fortran-static-linking.patch;apply=yes \
-	file://gcc-arm-frename-registers.patch;apply=yes \
-	file://gcc-4.3.2-SYSROOT_CFLAGS_FOR_TARGET.patch;apply=yes \
-	file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;apply=yes \
-	file://zecke-xgcc-cpp.patch;apply=yes \
-	file://gcc-flags-for-build.patch;apply=yes \
+	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;apply=yes "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
 
-SRC_URI_append_sh4  = " file://sh_unwind.patch;apply=yes \
-			file://gcc-4.2.3-linux-multilib-fix.patch;apply=yes \
+SRC_URI_append_sh4  = " file://sh_unwind.patch \
+			file://gcc-4.2.3-linux-multilib-fix.patch \
 		      "
 # Language Overrides
 FORTRAN = ""
diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc
index 6504f7b..77cd521 100644
--- a/recipes/gcc/gcc-4.3.3.inc
+++ b/recipes/gcc/gcc-4.3.3.inc
@@ -11,89 +11,89 @@ NATIVEDEPS = "mpfr-native gmp-native"
 INC_PR = "r12"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
-	file://fedora/gcc43-c++-builtin-redecl.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-ia64-libunwind.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-java-nomulti.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-ppc32-retaddr.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-pr27898.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-pr32139.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-pr33763.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-rh330771.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-rh341221.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-cpp-pragma.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-java-debug-iface-type.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-libgomp-speedup.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-i386-libgomp.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-rh251682.patch;apply=yes;striplevel=0 \
+	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;apply=yes \
-	file://103-uclibc-conf-noupstream.patch;apply=yes \
-	file://200-uclibc-locale.patch;apply=yes \
-	file://203-uclibc-locale-no__x.patch;apply=yes \
-	file://204-uclibc-locale-wchar_fix.patch;apply=yes \
-	file://205-uclibc-locale-update.patch;apply=yes \
-	file://301-missing-execinfo_h.patch;apply=yes \
-	file://302-c99-snprintf.patch;apply=yes \
-	file://303-c99-complex-ugly-hack.patch;apply=yes \
-	file://304-index_macro.patch;apply=yes \
-	file://305-libmudflap-susv3-legacy.patch;apply=yes \
-	file://306-libstdc++-namespace.patch;apply=yes \
-	file://307-locale_facets.patch;apply=yes \
-	file://602-sdk-libstdc++-includes.patch;apply=yes \
-	file://740-sh-pr24836.patch;apply=yes \
-	file://800-arm-bigendian.patch;apply=yes \
-	file://904-flatten-switch-stmt-00.patch;apply=yes \
-	file://arm-nolibfloat.patch;apply=yes \
-	file://arm-softfloat.patch;apply=yes \
-	file://cache-amnesia.patch;apply=yes \
-	file://gfortran-4.3.x.patch;apply=yes \
-	file://gcc-4.0.2-e300c2c3.patch;apply=yes \
-#	file://pr34130.patch;apply=yes \
-#	file://fortran-static-linking.patch;apply=yes \
-	file://gcc-arm-frename-registers.patch;apply=yes \
-	file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;apply=yes \
-	file://zecke-xgcc-cpp.patch;apply=yes \
-	file://gcc-flags-for-build.patch;apply=yes \
-	file://gcc-pr36218.patch;apply=yes \
-	file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch;apply=yes \
-        file://arm-gcc-objective.patch;apply=yes \
+	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;apply=yes "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
 
-SRC_URI_append_sh4  = " file://sh_unwind.patch;apply=yes \
-			file://gcc-4.2.3-linux-multilib-fix.patch;apply=yes \
+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;apply=yes \
-	file://ep93xx/arm-crunch-saveregs.patch;apply=yes \
-	file://ep93xx/arm-crunch-scratch.patch;apply=yes \
-	file://ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch;apply=yes \
-	file://ep93xx/arm-crunch-eabi-mvf0-scratch-ieee754.patch;apply=yes \
-	file://ep93xx/arm-crunch-20000320.patch;apply=yes \
-	file://ep93xx/arm-crunch-disable-cmpdi.patch;apply=yes \
-	file://ep93xx/arm-crunch-fix-64bit-const-offsets.patch;apply=yes \
-	file://ep93xx/arm-crunch-fp_consts.patch;apply=yes \
-	file://ep93xx/arm-crunch-neg-enable.patch;apply=yes \
-	file://ep93xx/arm-crunch-neg-protect.patch;apply=yes \
-	file://ep93xx/arm-crunch-repair-truncxfsi.patch;apply=yes \
-	file://ep93xx/arm-crunch-floatsi-no-scratch.patch;apply=yes \
-	file://ep93xx/arm-crunch-movsf-movdf-Uy.patch;apply=yes \
-	file://ep93xx/arm-crunch-drop-thumb2.patch;apply=yes \
-	file://ep93xx/arm-crunch-arm_dbx_register_number.patch;apply=yes \
-	file://ep93xx/arm-crunch-pipeline.patch;apply=yes \
-	file://ep93xx/arm-crunch-ccmav-mode.patch;apply=yes \
-	file://ep93xx/arm-crunch-cfcpy-with-cfsh64.patch;apply=yes \
-	file://ep93xx/arm-crunch-mieee.patch;apply=yes \
-	file://ep93xx/arm-size-bugfix.patch;apply=yes \
-	file://ep93xx/arm-prologue_use-length.patch;apply=yes \
-	file://ep93xx/arm-crunch-cftruncd32-attr.patch;apply=yes \
-	file://ep93xx/arm-crunch-fix-cirrus-reorg7.patch;apply=yes \
-	file://ep93xx/arm-crunch-cirrus-di-flag.patch;apply=yes \
-	file://ep93xx/arm-crunch-disable-floatsi.patch;apply=yes \
+	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 = ""
diff --git a/recipes/gcc/gcc-4.3.4.inc b/recipes/gcc/gcc-4.3.4.inc
index 8cc5cd0..9711813 100644
--- a/recipes/gcc/gcc-4.3.4.inc
+++ b/recipes/gcc/gcc-4.3.4.inc
@@ -11,87 +11,87 @@ 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;apply=yes;striplevel=0 \
-	file://fedora/gcc43-ia64-libunwind.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-java-nomulti.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-ppc32-retaddr.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-pr27898.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-pr32139.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-pr33763.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-rh330771.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-rh341221.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-cpp-pragma.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-java-debug-iface-type.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-libgomp-speedup.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-i386-libgomp.patch;apply=yes;striplevel=0 \
-	file://fedora/gcc43-rh251682.patch;apply=yes;striplevel=0 \
+	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;apply=yes \
-	file://103-uclibc-conf-noupstream.patch;apply=yes \
-	file://200-uclibc-locale.patch;apply=yes \
-	file://203-uclibc-locale-no__x.patch;apply=yes \
-	file://204-uclibc-locale-wchar_fix.patch;apply=yes \
-	file://205-uclibc-locale-update.patch;apply=yes \
-	file://301-missing-execinfo_h.patch;apply=yes \
-	file://302-c99-snprintf.patch;apply=yes \
-	file://303-c99-complex-ugly-hack.patch;apply=yes \
-	file://304-index_macro.patch;apply=yes \
-	file://305-libmudflap-susv3-legacy.patch;apply=yes \
-	file://306-libstdc++-namespace.patch;apply=yes \
-	file://307-locale_facets.patch;apply=yes \
-	file://602-sdk-libstdc++-includes.patch;apply=yes \
-	file://740-sh-pr24836.patch;apply=yes \
-	file://800-arm-bigendian.patch;apply=yes \
-	file://904-flatten-switch-stmt-00.patch;apply=yes \
-	file://arm-nolibfloat.patch;apply=yes \
-	file://arm-softfloat.patch;apply=yes \
-	file://cache-amnesia.patch;apply=yes \
-	file://gfortran-4.3.x.patch;apply=yes \
-	file://gcc-4.0.2-e300c2c3.patch;apply=yes \
-#	file://pr34130.patch;apply=yes \
-#	file://fortran-static-linking.patch;apply=yes \
-	file://gcc-arm-frename-registers.patch;apply=yes \
-	file://gcc-4.3.4-SYSROOT_CFLAGS_FOR_TARGET.patch;apply=yes \
-	file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;apply=yes \
-	file://zecke-xgcc-cpp.patch;apply=yes \
-	file://gcc-flags-for-build.patch;apply=yes \
+	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;apply=yes "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
 
-SRC_URI_append_sh4  = " file://sh_unwind.patch;apply=yes \
-			file://gcc-4.2.3-linux-multilib-fix.patch;apply=yes \
+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;apply=yes \
-	file://ep93xx/arm-crunch-saveregs.patch;apply=yes \
-	file://ep93xx/arm-crunch-scratch.patch;apply=yes \
-	file://ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch;apply=yes \
-	file://ep93xx/arm-crunch-eabi-mvf0-scratch-ieee754.patch;apply=yes \
-	file://ep93xx/arm-crunch-20000320.patch;apply=yes \
-	file://ep93xx/arm-crunch-disable-cmpdi.patch;apply=yes \
-	file://ep93xx/arm-crunch-fix-64bit-const-offsets.patch;apply=yes \
-	file://ep93xx/arm-crunch-fp_consts.patch;apply=yes \
-	file://ep93xx/arm-crunch-neg-enable.patch;apply=yes \
-	file://ep93xx/arm-crunch-neg-protect.patch;apply=yes \
-	file://ep93xx/arm-crunch-repair-truncxfsi.patch;apply=yes \
-	file://ep93xx/arm-crunch-floatsi-no-scratch.patch;apply=yes \
-	file://ep93xx/arm-crunch-movsf-movdf-Uy.patch;apply=yes \
-	file://ep93xx/arm-crunch-drop-thumb2.patch;apply=yes \
-	file://ep93xx/arm-crunch-arm_dbx_register_number.patch;apply=yes \
-	file://ep93xx/arm-crunch-pipeline.patch;apply=yes \
-	file://ep93xx/arm-crunch-ccmav-mode.patch;apply=yes \
-	file://ep93xx/arm-crunch-cfcpy-with-cfsh64.patch;apply=yes \
-	file://ep93xx/arm-crunch-mieee.patch;apply=yes \
-	file://ep93xx/arm-size-bugfix.patch;apply=yes \
-	file://ep93xx/arm-prologue_use-length.patch;apply=yes \
-	file://ep93xx/arm-crunch-cftruncd32-attr.patch;apply=yes \
-	file://ep93xx/arm-crunch-fix-cirrus-reorg7.patch;apply=yes \
-	file://ep93xx/arm-crunch-cirrus-di-flag.patch;apply=yes \
-	file://ep93xx/arm-crunch-disable-floatsi.patch;apply=yes \
+	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 = ""
diff --git a/recipes/gcc/gcc-4.4.1.inc b/recipes/gcc/gcc-4.4.1.inc
index 2a8c555..11b1535 100644
--- a/recipes/gcc/gcc-4.4.1.inc
+++ b/recipes/gcc/gcc-4.4.1.inc
@@ -13,18 +13,18 @@ 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;apply=yes \
-	file://100-uclibc-conf.patch;apply=yes \
-	file://gcc-uclibc-locale-ctype_touplow_t.patch;apply=yes \
-	file://gcc-disable-linux-unwind-with-libc-inhibit.patch;apply=yes \
-	file://gcc-link-libgcc-with-libm.patch;apply=yes \
-	file://gcc-improve-tls-macro.patch;apply=yes \
-	file://cache-amnesia.patch;apply=yes \
-	file://gcc-flags-for-build.patch;apply=yes \
-	file://gcc-ppc_single_precision_regs.patch;apply=yes \
-	file://gcc-ppc_add_d_constraint.patch;apply=yes \
-	file://gcc-pr41175.patch;apply=yes \
-	file://gcc-armv4-pass-fix-v4bx-to-ld.patch;apply=yes \
+        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 = ""
diff --git a/recipes/gcc/gcc-4.4.2.inc b/recipes/gcc/gcc-4.4.2.inc
index 33201a7..8d14c99 100644
--- a/recipes/gcc/gcc-4.4.2.inc
+++ b/recipes/gcc/gcc-4.4.2.inc
@@ -13,18 +13,18 @@ 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;apply=yes \
-	file://100-uclibc-conf.patch;apply=yes \
-	file://gcc-uclibc-locale-ctype_touplow_t.patch;apply=yes \
-	file://gcc-disable-linux-unwind-with-libc-inhibit.patch;apply=yes \
-	file://gcc-link-libgcc-with-libm.patch;apply=yes \
-	file://gcc-improve-tls-macro.patch;apply=yes \
-	file://cache-amnesia.patch;apply=yes \
-	file://gcc-flags-for-build.patch;apply=yes \
-	file://gcc-ppc_single_precision_regs.patch;apply=yes \
-	file://gcc-ppc_add_d_constraint.patch;apply=yes \
-	file://gcc-pr41175.patch;apply=yes \
-	file://gcc-armv4-pass-fix-v4bx-to-ld.patch;apply=yes \
+        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 = ""
diff --git a/recipes/gcc/gcc-4.4.4.inc b/recipes/gcc/gcc-4.4.4.inc
index 460ceac..4dd1bf6 100644
--- a/recipes/gcc/gcc-4.4.4.inc
+++ b/recipes/gcc/gcc-4.4.4.inc
@@ -13,19 +13,19 @@ 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;apply=yes \
-	file://100-uclibc-conf.patch;apply=yes \
-	file://gcc-uclibc-locale-ctype_touplow_t.patch;apply=yes \
-	file://gcc-disable-linux-unwind-with-libc-inhibit.patch;apply=yes \
-	file://gcc-link-libgcc-with-libm.patch;apply=yes \
-	file://gcc-improve-tls-macro.patch;apply=yes \
-	file://cache-amnesia.patch;apply=yes \
-	file://gcc-flags-for-build.patch;apply=yes \
-	file://gcc-ppc_single_precision_regs.patch;apply=yes \
-	file://gcc-ppc_add_d_constraint.patch;apply=yes \
-	file://gcc-pr41175.patch;apply=yes \
-	file://gcc-armv4-pass-fix-v4bx-to-ld.patch;apply=yes \
-	file://gcc-add-t-slibgcc-libgcc.patch;apply=yes \
+        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"
diff --git a/recipes/gcc/gcc-4.5.0.inc b/recipes/gcc/gcc-4.5.0.inc
index ab0ec3a..f445a57 100644
--- a/recipes/gcc/gcc-4.5.0.inc
+++ b/recipes/gcc/gcc-4.5.0.inc
@@ -12,11 +12,11 @@ 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;apply=yes \
-	   file://100-uclibc-conf.patch;apply=yes \
-           file://gcc-uclibc-locale-ctype_touplow_t.patch;apply=yes \
-	   file://cache-amnesia.patch;apply=yes \
-	   file://gcc-flags-for-build.patch;apply=yes \
+	   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
diff --git a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
index 5068fec..7a1402f 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;apply=yes \
-		  file://pr22133-mingw-path-fixup.patch;apply=yes \
-		  file://pr33281-mingw-host-fragment.patch;apply=yes \
-		  file://pr35916-mingw-__USE_MINGW_ACCESS-everywhere.patch;apply=yes \
-		  file://canadian-build-modules-configure.patch;apply=yes \
+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-cross-kernel-3.4.4_3.4.4.bb b/recipes/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb
index ea34547..c7dda1d 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;apply=yes"
+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 423dff4..700839c 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;apply=yes"
+SRC_URI += "file://gcc-3.4.4-makefile-fix.patch"
 
diff --git a/recipes/gcc/gcc-cross-sdk_3.3.4.bb b/recipes/gcc/gcc-cross-sdk_3.3.4.bb
index a778ecd..b9fca30 100644
--- a/recipes/gcc/gcc-cross-sdk_3.3.4.bb
+++ b/recipes/gcc/gcc-cross-sdk_3.3.4.bb
@@ -5,5 +5,5 @@ inherit sdk
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
 
-SRC_URI += 'file://sdk-libstdc++-includes.patch;apply=yes'
+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 e43aab9..b1ca74b 100644
--- a/recipes/gcc/gcc-cross-sdk_3.4.3.bb
+++ b/recipes/gcc/gcc-cross-sdk_3.4.3.bb
@@ -3,4 +3,4 @@ PR = "${INC_PR}.1"
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
 
-SRC_URI += 'file://sdk-libstdc++-includes.patch;apply=yes'
+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 27e0bb5..16ca9e4 100644
--- a/recipes/gcc/gcc-cross-sdk_3.4.4.bb
+++ b/recipes/gcc/gcc-cross-sdk_3.4.4.bb
@@ -3,7 +3,7 @@ PR = "${INC_PR}.1"
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
 
-SRC_URI += 'file://sdk-libstdc++-includes.patch;apply=yes'
+SRC_URI += 'file://sdk-libstdc++-includes.patch'
 
 do_compile_prepend () {
 	mkdir -p gcc
diff --git a/recipes/gcc/gcc-cross_4.1.1.bb b/recipes/gcc/gcc-cross_4.1.1.bb
index 3ca89e9..1864078 100644
--- a/recipes/gcc/gcc-cross_4.1.1.bb
+++ b/recipes/gcc/gcc-cross_4.1.1.bb
@@ -3,6 +3,6 @@ PR = "${INC_PR}.1"
 require gcc-${PV}.inc
 require gcc-cross4.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;apply=yes "
+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 bb07135..d2038c7 100644
--- a/recipes/gcc/gcc-cross_4.1.2.bb
+++ b/recipes/gcc/gcc-cross_4.1.2.bb
@@ -3,7 +3,7 @@ PR = "${INC_PR}.1"
 require gcc-${PV}.inc
 require gcc-cross4.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;apply=yes "
+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 2499e23..ae7f2b7 100644
--- a/recipes/gcc/gcc-cross_4.2.1.bb
+++ b/recipes/gcc/gcc-cross_4.2.1.bb
@@ -3,7 +3,7 @@ PR = "r21"
 require gcc-${PV}.inc
 require gcc-cross4.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;apply=yes "
+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 7fb904c..30c1d78 100644
--- a/recipes/gcc/gcc-cross_4.2.2.bb
+++ b/recipes/gcc/gcc-cross_4.2.2.bb
@@ -3,7 +3,7 @@ PR = "${INC_PR}.1"
 require gcc-${PV}.inc
 require gcc-cross4.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;apply=yes "
+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 a62c625..13dec27 100644
--- a/recipes/gcc/gcc-cross_4.2.3.bb
+++ b/recipes/gcc/gcc-cross_4.2.3.bb
@@ -3,7 +3,7 @@ PR = "${INC_PR}.1"
 require gcc-${PV}.inc
 require gcc-cross4.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;apply=yes "
+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 a62c625..13dec27 100644
--- a/recipes/gcc/gcc-cross_4.2.4.bb
+++ b/recipes/gcc/gcc-cross_4.2.4.bb
@@ -3,7 +3,7 @@ PR = "${INC_PR}.1"
 require gcc-${PV}.inc
 require gcc-cross4.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;apply=yes "
+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 8ced937..1c191fa 100644
--- a/recipes/gcc/gcc-cross_4.3.1.bb
+++ b/recipes/gcc/gcc-cross_4.3.1.bb
@@ -3,7 +3,7 @@ PR = "${INC_PR}.1"
 require gcc-${PV}.inc
 require gcc-cross4.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;apply=yes "
+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 c4fc6a3..322a203 100644
--- a/recipes/gcc/gcc-cross_4.3.2.bb
+++ b/recipes/gcc/gcc-cross_4.3.2.bb
@@ -2,7 +2,7 @@ PR = "${INC_PR}.1"
 require gcc-${PV}.inc
 require gcc-cross4.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;apply=yes "
+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 113e588..c8e2f9b 100644
--- a/recipes/gcc/gcc-cross_4.3.3.bb
+++ b/recipes/gcc/gcc-cross_4.3.3.bb
@@ -2,7 +2,7 @@ PR = "${INC_PR}.1"
 require gcc-${PV}.inc
 require gcc-cross4.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;apply=yes "
+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 d6a19ee..7edb21b 100644
--- a/recipes/gcc/gcc-cross_4.3.4.bb
+++ b/recipes/gcc/gcc-cross_4.3.4.bb
@@ -2,7 +2,7 @@ PR = "${INC_PR}.0"
 require gcc-${PV}.inc
 require gcc-cross4.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;apply=yes "
+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 51d6637..fce459b 100644
--- a/recipes/gcc/gcc-cross_4.4.1.bb
+++ b/recipes/gcc/gcc-cross_4.4.1.bb
@@ -2,7 +2,7 @@ require gcc-${PV}.inc
 require gcc-cross4.inc
 PR = "${INC_PR}.1"
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;apply=yes "
+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 51d6637..fce459b 100644
--- a/recipes/gcc/gcc-cross_4.4.2.bb
+++ b/recipes/gcc/gcc-cross_4.4.2.bb
@@ -2,7 +2,7 @@ require gcc-${PV}.inc
 require gcc-cross4.inc
 PR = "${INC_PR}.1"
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;apply=yes "
+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.4.bb b/recipes/gcc/gcc-cross_4.4.4.bb
index ff711fd..4309fd4 100644
--- a/recipes/gcc/gcc-cross_4.4.4.bb
+++ b/recipes/gcc/gcc-cross_4.4.4.bb
@@ -2,7 +2,7 @@ require gcc-${PV}.inc
 require gcc-cross4.inc
 PR = "${INC_PR}.0"
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;apply=yes "
+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
index 9bb5da8..825a7bd 100644
--- a/recipes/gcc/gcc-cross_4.5.0.bb
+++ b/recipes/gcc/gcc-cross_4.5.0.bb
@@ -4,7 +4,7 @@ require gcc-cross4.inc
 
 DEPENDS += "libmpc-native"
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;apply=yes "
+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-cross_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb
index 13b41e2..945e8ac 100644
--- a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb
+++ b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb
@@ -3,7 +3,7 @@ PR = "r6"
 require gcc-csl-arm-2007q3.inc
 require gcc-cross4.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;apply=yes "
+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 25500cc..a3edb28 100644
--- a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb
+++ b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb
@@ -3,7 +3,7 @@ PR = "r5"
 require gcc-csl-arm-2008q1.inc
 require gcc-cross4.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;apply=yes "
+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 6553964..88b222e 100644
--- a/recipes/gcc/gcc-cross_csl-arm-2008q3.bb
+++ b/recipes/gcc/gcc-cross_csl-arm-2008q3.bb
@@ -3,7 +3,7 @@ PR = "r1"
 require gcc-csl-arm-2008q3.inc
 require gcc-cross4.inc
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;apply=yes "
+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 9bb5da8..825a7bd 100644
--- a/recipes/gcc/gcc-cross_svn.bb
+++ b/recipes/gcc/gcc-cross_svn.bb
@@ -4,7 +4,7 @@ require gcc-cross4.inc
 
 DEPENDS += "libmpc-native"
 
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;apply=yes "
+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 8eccaa9..3e9f3db 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;apply=yes \
-           file://gcc-3.4.4-eabi-bigendian.patch;apply=yes \
-           file://libstdc++_configure.patch;apply=yes \
-           file://demangle.patch;apply=yes \
+           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 b290ffd..0fabaef 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;apply=yes \
-           file://gcc-new-makeinfo.patch;apply=yes"
+           file://gcc-configure-no-fortran.patch \
+           file://gcc-new-makeinfo.patch"
 
 S = "${WORKDIR}/gcc-2006q1"
 
diff --git a/recipes/gcc/gcc-csl-arm-2007q3.inc b/recipes/gcc/gcc-csl-arm-2007q3.inc
index fc47e9e..7242313 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;apply=yes \
-#           file://100-uclibc-conf.patch;apply=yes \
-#           file://103-uclibc-conf-noupstream.patch;apply=yes \
-#           file://200-uclibc-locale.patch;apply=yes \
-#           file://203-uclibc-locale-no__x.patch;apply=yes \
-#           file://204-uclibc-locale-wchar_fix.patch;apply=yes \
-#           file://205-uclibc-locale-update.patch;apply=yes \
-#           file://300-libstdc++-pic.patch;apply=yes \
-#           file://302-c99-snprintf.patch;apply=yes \
-#           file://303-c99-complex-ugly-hack.patch;apply=yes \
-#           file://304-index_macro.patch;apply=yes \
-#           file://305-libmudflap-susv3-legacy.patch;apply=yes \
-#           file://306-libstdc++-namespace.patch;apply=yes \
-#           file://307-locale_facets.patch;apply=yes \
-#           file://402-libbackend_dep_gcov-iov.h.patch;apply=yes \
-#           file://602-sdk-libstdc++-includes.patch;apply=yes \
-           file://gcc41-configure.in.patch;apply=yes \
-           file://arm-nolibfloat.patch;apply=yes \
-           file://arm-softfloat.patch;apply=yes \
-           file://zecke-xgcc-cpp.patch;apply=yes \
-#           file://gfortran.patch;apply=yes \
-#           file://fortran-static-linking.patch;apply=yes \
-#           file://gcc-configure-no-fortran.patch;apply=yes \
-#           file://gcc-new-makeinfo.patch;apply=yes \
-           file://gcc-Os-fix.diff;apply=yes \
+           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 \
 "
 
 
diff --git a/recipes/gcc/gcc-csl-arm-2008q1.inc b/recipes/gcc/gcc-csl-arm-2008q1.inc
index 8ec8cb8..be686a8 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;apply=yes \
-#           file://103-uclibc-conf-noupstream.patch;apply=yes \
-#           file://200-uclibc-locale.patch;apply=yes \
-#           file://203-uclibc-locale-no__x.patch;apply=yes \
-#           file://204-uclibc-locale-wchar_fix.patch;apply=yes \
-#           file://205-uclibc-locale-update.patch;apply=yes \
-#           file://300-libstdc++-pic.patch;apply=yes \
-#           file://302-c99-snprintf.patch;apply=yes \
-#           file://303-c99-complex-ugly-hack.patch;apply=yes \
-#           file://304-index_macro.patch;apply=yes \
-#           file://305-libmudflap-susv3-legacy.patch;apply=yes \
-#           file://306-libstdc++-namespace.patch;apply=yes \
-#           file://307-locale_facets.patch;apply=yes \
-#           file://402-libbackend_dep_gcov-iov.h.patch;apply=yes \
-#           file://602-sdk-libstdc++-includes.patch;apply=yes \
-           file://gcc41-configure.in.patch;apply=yes \
-           file://arm-nolibfloat.patch;apply=yes \
-           file://arm-softfloat.patch;apply=yes \
-           file://zecke-xgcc-cpp.patch;apply=yes \
-#           file://gfortran-4.3.x.patch;apply=yes \
-#           file://fortran-static-linking.patch;apply=yes \
-#           file://gcc-configure-no-fortran.patch;apply=yes \
-#           file://gcc-new-makeinfo.patch;apply=yes \
+#           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 \
 "
 
 
diff --git a/recipes/gcc/gcc-csl-arm-2008q3.inc b/recipes/gcc/gcc-csl-arm-2008q3.inc
index 6525dd9..79a9f8f 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;apply=yes \
-           file://arm-nolibfloat.patch;apply=yes \
-           file://arm-softfloat.patch;apply=yes \
-           file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;apply=yes \
-           file://gcc-flags-for-build.patch;apply=yes \
-           file://gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch;apply=yes \
-           file://gfortran-4.3.x.patch;apply=yes \
+           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-svn.inc b/recipes/gcc/gcc-svn.inc
index 568462c..14175e7 100644
--- a/recipes/gcc/gcc-svn.inc
+++ b/recipes/gcc/gcc-svn.inc
@@ -14,11 +14,11 @@ 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;apply=yes \
-	   file://100-uclibc-conf.patch;apply=yes \
-           file://gcc-uclibc-locale-ctype_touplow_t.patch;apply=yes \
-	   file://cache-amnesia.patch;apply=yes \
-	   file://gcc-flags-for-build.patch;apply=yes \
+	   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
diff --git a/recipes/gcc/gcc_4.2.2.bb b/recipes/gcc/gcc_4.2.2.bb
index d5c7246..30713f8 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;apply=yes"
+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 88887ac..6fe3028 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;apply=yes"
+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 88887ac..6fe3028 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;apply=yes"
+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 7b854a4..442c273 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;apply=yes"
+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 e5635a5..c73dfc1 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;apply=yes"
+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 7a9a13e..274f474 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;apply=yes"
+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 0cf1ff1..ec20085 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;apply=yes"
+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 0d156bc..52b09cf 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;apply=yes"
+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 d46e46a..d1d50ad 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;apply=yes"
+SRC_URI_append = "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
 
diff --git a/recipes/gcc/gcc_4.4.4.bb b/recipes/gcc/gcc_4.4.4.bb
index ff9ff95..271e9d1 100644
--- a/recipes/gcc/gcc_4.4.4.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;apply=yes"
+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
index 262c072..40e1f7c 100644
--- a/recipes/gcc/gcc_4.5.0.bb
+++ b/recipes/gcc/gcc_4.5.0.bb
@@ -8,6 +8,6 @@ FILES_${PN} += "\
         ${gcclibdir}/${TARGET_SYS}/*/*.o \
 "
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch;apply=yes"
+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 262c072..40e1f7c 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;apply=yes"
+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 252baba..acdccc8 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;apply=yes \
+	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 0344b44..0c0c74f 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;apply=yes \
+	   file://includedir.patch \
 "
 
 
diff --git a/recipes/gdal/gdal_1.5.2.bb b/recipes/gdal/gdal_1.5.2.bb
index 6705904..4ad15ea 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;apply=yes \
+	   file://gdal_config.patch \
  	  "
 
 ARM_INSTRUCTION_SET = "arm"
diff --git a/recipes/gdb/gdb-canadian-sdk_6.8.bb b/recipes/gdb/gdb-canadian-sdk_6.8.bb
index 117c491..51731ff 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;apply=yes;striplevel=0 \
-	    file://gdb-6.8-mingw-3.patch;apply=yes \
-	    file://gdb-6.8-pr9638-ppc-canadian-configh.patch;apply=yes \
-	    file://gdb-6.8-fix-compile-karmic.patch;apply=yes \
-	    file://gdb-6.8-mips-mingw-sim-fixup.patch;apply=yes"
+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 3ba353c..2178c97 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;apply=yes \
-	    file://gdb-6.8-pr9638-ppc-canadian-configh.patch;apply=yes \
-	    file://gdb-6.8-fix-compile-karmic.patch;apply=yes \
+	    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
index 2fa6c3b..334d555 100644
--- a/recipes/gdb/gdb-canadian-sdk_7.1.bb
+++ b/recipes/gdb/gdb-canadian-sdk_7.1.bb
@@ -2,9 +2,9 @@ require gdb-canadian-cross.inc
 LICENSE = "GPLv3"
 
 SRC_URI += "\
-	    file://gdb-6.8-mingw-3.patch;apply=yes \
-	    file://gdb-6.8-pr9638-ppc-canadian-configh.patch;apply=yes \
-	    file://gdb-6.8-fix-compile-karmic.patch;apply=yes \
+	    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-cross-sdk_6.6.bb b/recipes/gdb/gdb-cross-sdk_6.6.bb
index cf03fde..fb81c5e 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;apply=yes;striplevel=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 9f442a3..34108c8 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;apply=yes;striplevel=0 \
-            file://gdb-6.8-fix-compile-karmic.patch;apply=yes"
+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 258716b..238ce15 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;apply=yes"
+            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
index 015580a..54cc113 100644
--- a/recipes/gdb/gdb-cross-sdk_7.1.bb
+++ b/recipes/gdb/gdb-cross-sdk_7.1.bb
@@ -2,7 +2,7 @@ require gdb-cross.inc
 LICENSE = "GPLv3"
 
 SRC_URI += "\
-            file://gdb-6.8-fix-compile-karmic.patch;apply=yes"
+            file://gdb-6.8-fix-compile-karmic.patch"
 
 DEPENDS = "ncurses-sdk zlib-sdk flex-native"
 
diff --git a/recipes/gdb/gdb-cross_6.3.bb b/recipes/gdb/gdb-cross_6.3.bb
index 240382f..937b669 100644
--- a/recipes/gdb/gdb-cross_6.3.bb
+++ b/recipes/gdb/gdb-cross_6.3.bb
@@ -3,8 +3,8 @@ LICENSE = "GPLv2"
 
 PR = "r3"
 
-SRC_URI += "file://sim-install-makefile.patch;apply=yes \
-	file://sim-install-makefile-common.patch;apply=yes"
+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.6.bb b/recipes/gdb/gdb-cross_6.6.bb
index 9a743d8..b9a9f5f 100644
--- a/recipes/gdb/gdb-cross_6.6.bb
+++ b/recipes/gdb/gdb-cross_6.6.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 
 PR = "r3"
 
-SRC_URI += "file://early_debug_in_nptl.patch;apply=yes;striplevel=0"
+SRC_URI += "file://early_debug_in_nptl.patch;striplevel=0"
 
 
 SRC_URI[md5sum] = "18be4e7a1ac713bda93d00fee20bbef8"
diff --git a/recipes/gdb/gdb-cross_6.8.bb b/recipes/gdb/gdb-cross_6.8.bb
index 6d5edf8..f943bc2 100644
--- a/recipes/gdb/gdb-cross_6.8.bb
+++ b/recipes/gdb/gdb-cross_6.8.bb
@@ -1,8 +1,8 @@
 require gdb-cross.inc
 LICENSE = "GPLv3"
 
-SRC_URI += "file://gcc-4.3-build-error.patch;apply=yes;striplevel=0 \
-            file://gdb-6.8-fix-compile-karmic.patch;apply=yes"
+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 74cf919..421403a 100644
--- a/recipes/gdb/gdb-cross_7.0.bb
+++ b/recipes/gdb/gdb-cross_7.0.bb
@@ -2,7 +2,7 @@ require gdb-cross.inc
 LICENSE = "GPLv3"
 
 SRC_URI += " \
-            file://gdb-6.8-fix-compile-karmic.patch;apply=yes"
+            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
index fefa48a..2c022db 100644
--- a/recipes/gdb/gdb-cross_7.1.bb
+++ b/recipes/gdb/gdb-cross_7.1.bb
@@ -2,7 +2,7 @@ require gdb-cross.inc
 LICENSE = "GPLv3"
 
 SRC_URI += " \
-            file://gdb-6.8-fix-compile-karmic.patch;apply=yes"
+            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 619be94..3500e1a 100644
--- a/recipes/gdb/gdb.inc
+++ b/recipes/gdb/gdb.inc
@@ -16,9 +16,9 @@ RRECOMMENDS_gdb_append_linux-spe = " uclibc-thread-db "
 
 inherit gettext
 
-SRC_URI += "file://kill_arm_map_symbols.patch;apply=yes \
-            file://gdbserver-cflags-last.diff;apply=yes;striplevel=0"
-#FIXME	   file://uclibc.patch;apply=yes \
+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'"
 
diff --git a/recipes/gdb/gdb_6.6.bb b/recipes/gdb/gdb_6.6.bb
index 3d3a330..7f18882 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;apply=yes;striplevel=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 2287181..9d6d54f 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;apply=yes;striplevel=0 \
-            file://gdb-6.8-fix-compile-karmic.patch;apply=yes"
+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 aacf737..72a78db 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;apply=yes"
+            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
index d872fb1..5489c80 100644
--- a/recipes/gdb/gdb_7.1.bb
+++ b/recipes/gdb/gdb_7.1.bb
@@ -2,7 +2,7 @@ require gdb.inc
 LICENSE = "GPLv3"
 
 SRC_URI += "\
-            file://gdb-6.8-fix-compile-karmic.patch;apply=yes"
+            file://gdb-6.8-fix-compile-karmic.patch"
 
 # Work-around problems while creating libbfd.a
 EXTRA_OECONF += "--enable-static"
diff --git a/recipes/gdb/gdbserver.inc b/recipes/gdb/gdbserver.inc
index 5e0cf6b..115f293 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;apply=yes \
-            file://gdbserver-cflags-last.diff;apply=yes;striplevel=0"
-#FIXME	   file://uclibc.patch;apply=yes \
+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/gdbm/gdbm-native_1.8.3.bb b/recipes/gdbm/gdbm-native_1.8.3.bb
index 816c4a4..8009e1e 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;apply=yes"
+	   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 e5d883a..e84777e 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;apply=yes \
-           file://libtool-mode.patch;apply=yes"
+	   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 4fc0f34..7cb5c60 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;apply=yes \
+           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 11e4c25..8617311 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;apply=yes"
+            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 391112f..611a4cb 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;apply=yes"
+	   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 3f5f7ca..93511d2 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;apply=yes"
+           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 021c37f..2eab2ff 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;apply=yes"
+	   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 f233fe2..90018b0 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;apply=yes"
+	   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 890984c..e907abb 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;apply=yes"
+	   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 594e570..4d45c4c 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;apply=yes \
+	   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 664e02b..535fceb 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;apply=yes \
-	   file://fixchicken.patch;apply=yes \
-	   file://linklib_from_0.17.patch;apply=yes \
-	   file://gettext-autoconf-lib-link-no-L.patch;apply=yes \
-           file://getline.m4.patch;apply=yes \
-           file://disable_java.patch;apply=yes"
-
-SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;apply=yes"
-SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch;apply=yes"
+	   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 3fc123d..9bd145d 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;apply=yes \
-	   file://wchar-uclibc.patch;apply=yes \
-	   file://use_open_properly.patch;apply=yes \
-	   file://gettext-autoconf-lib-link-no-L.patch;apply=yes \
-	   file://m4_copy.patch;apply=yes \
+	   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;apply=yes"
-SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch;apply=yes"
+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 819d3a0..5db223e 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;apply=yes \
-	 file://gftp-2.0.18-188252.patch;apply=yes \
-	 file://gftp-2.0.18-ipv6.patch;apply=yes;striplevel=2 \
-	 file://gftp-2.0.18-ssh2-read.patch;apply=yes \
-	 file://gftp-2.0.18-ssl-wildcardcert.patch;apply=yes;striplevel=0 \
-	 file://gftp-2.0.18-mkinstalldir.patch;apply=yes "
+	 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 26b9856..52d805e 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;apply=yes"
+           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 bb3a786..74b7046 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;apply=yes \
+           file://ggz-unbreak-m4.patch \
           "
 
 inherit autotools
diff --git a/recipes/giblib/giblib.inc b/recipes/giblib/giblib.inc
index f75db11..01af60b 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;apply=yes"
+	   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 5afb079..fcfb83d 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;apply=yes"
+SRC_URI += "file://pkgconfig.patch"
 
 SRC_URI[md5sum] = "06ae3113fdfe9f05a642bd844cc85eab"
 SRC_URI[sha256sum] = "42eb6bff68e88ef12a7ac2aa69848aeb29a8b69176b3bd3d9d67cf9a1233fe85"
diff --git a/recipes/giftcurs/giftcurs_0.6.2.bb b/recipes/giftcurs/giftcurs_0.6.2.bb
index 3023083..71c7b3e 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;apply=yes"
+	   file://m4.patch"
 S = "${WORKDIR}/giFTcurs-${PV}"
 
 inherit autotools
diff --git a/recipes/gimp/gegl_svn.bb b/recipes/gimp/gegl_svn.bb
index cfc062c..8605167 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;apply=yes"
+           file://gegl-resilience.patch"
 
 S = "${WORKDIR}/trunk"
 
diff --git a/recipes/gimp/gimp.inc b/recipes/gimp/gimp.inc
index 96b6a28..6462112 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;apply=yes"
+                 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 1acd354..92a7af8 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;apply=yes"
+                 file://configure-libwmf.patch"
 
 
 SRC_URI[md5sum] = "35fecf14cd5237065aef624b93030d5e"
diff --git a/recipes/git/git_1.7.0.2.bb b/recipes/git/git_1.7.0.2.bb
index 2a7578d..a3a73f0 100644
--- a/recipes/git/git_1.7.0.2.bb
+++ b/recipes/git/git_1.7.0.2.bb
@@ -3,7 +3,7 @@ require git.inc
 SRC_URI[src.md5sum] = "76518fa774b36de81d160b85fa4f19c1"
 SRC_URI[src.sha256sum] = "5601df7fc282fdd66de196b282694eb77dcfc50438f01587de144b3ead1a6b2f"
 
-SRC_URI += "file://git-less-hardlinks.diff;apply=yes"
+SRC_URI += "file://git-less-hardlinks.diff"
 
 EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes"
 
diff --git a/recipes/gizmod/gizmod_2.3.bb b/recipes/gizmod/gizmod_2.3.bb
index 31f4ef1..d02cc49 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;apply=yes \
-           file://fix-python-configure.patch;apply=yes \
-           file://disable-bmp.patch;apply=yes"
+           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 4579169..8dfd930 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;apply=yes \
+	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 6b13cca..27df6a8 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;apply=yes \
-           file://gkdial-ungnome.patch;apply=yes;striplevel=0 \
-           file://gkdial-gladedir.patch;apply=yes;striplevel=0 \
-           file://gkdial-gpepda.patch;apply=yes \
+           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 8535d85..bcba594 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;apply=yes"
+           file://destdir.patch"
 
 inherit pkgconfig
 
diff --git a/recipes/glew/libglew_1.5.1.bb b/recipes/glew/libglew_1.5.1.bb
index 93246c3..75a9a38 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;apply=yes \
+           file://autotools.patch \
           "
 
 inherit autotools lib_package
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 ebf1777..3fa560c 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;apply=yes \
+           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 03e0214..2604c40 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;apply=yes \
+           file://automake-lossage.patch \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;apply=yes"
+           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 e18b764..f04979f 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;apply=yes \
+           file://visibility.patch \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;apply=yes"
+           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 9c8d33e..6a1582b 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;apply=yes \
-	   file://glib-mkenums-nowarn.patch;apply=yes \
+	   file://glib-gettextize-dir.patch \
+	   file://glib-mkenums-nowarn.patch \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;apply=yes"
+           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 503c4d9..4170f79 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;apply=yes \
-	   file://glib-mkenums-nowarn.patch;apply=yes \
+	   file://glib-gettextize-dir.patch \
+	   file://glib-mkenums-nowarn.patch \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;apply=yes"
+           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 5a221cc..3617f6c 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;apply=yes"
+           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 4e6fb84..4ab344e 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;apply=yes"
+           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 f0cecf8..12b24e2 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;apply=yes"
+           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 0feca2a..4e04ec8 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;apply=yes"
+           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 10927a3..9c526a8 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;apply=yes"
+           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 cf8350b..5db6bbf 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;apply=yes"
+           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 0382109..04da06c 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;apply=yes \
-           file://gcc-4.2-inline-fix.patch;apply=yes"
+           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 8699f31..c1664df 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;apply=yes \
-           file://gcc-4.2-inline-fix.patch;apply=yes"
+           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 92dbc55..82aff6d 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;apply=yes \
-           file://gcc-4.2-inline-fix.patch;apply=yes"
+           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 4622773..ece8c0c 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;apply=yes \
+           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 bc59c95..06ef688 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;apply=yes \
-           file://gcc-4.2-inline-fix.patch;apply=yes \
-           file://hurd-arg-max.patch;apply=yes \
+           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 949837f..b2815da 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;apply=yes \
+           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 e6954dd..632eaf6 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;apply=yes \
+           file://configure-libtool.patch \
           "
 
-SRC_URI_append_arm = "file://atomic-thumb.patch;apply=yes"
+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 638e26a..497d2b4 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;apply=yes \
+           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 e8b25fd..d657462 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;apply=yes \
+  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 fe67b29..cf676ef 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;apply=yes \
+  file://configure-libtool.patch \
 "
-SRC_URI_append_arm = " file://atomic-thumb.patch;apply=yes"
+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 522a2eb..d4f609e 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;apply=yes \
+  file://configure-libtool.patch \
 "
-SRC_URI_append_arm = " file://atomic-thumb.patch;apply=yes"
+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 c83ca41..b85ecb3 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;apply=yes \
+           file://automake-lossage.patch \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;apply=yes"
+           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 3851951..157ef80 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;apply=yes \
+  file://configure-libtool.patch \
 "
-SRC_URI_append_arm = " file://atomic-thumb.patch;apply=yes"
+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 f9f1c4c..3d8bb77 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;apply=yes \
+  file://configure-libtool.patch \
 "
-SRC_URI_append_arm = " file://atomic-thumb.patch;apply=yes"
+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 c21ff00..ac2cdef 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;apply=yes \
-  file://bug-556515.patch;apply=yes \
-  file://g_once_init_enter.patch;apply=yes \
-  file://uclibc-res_query.patch;apply=yes \
+  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;apply=yes \
+SRC_URI_append_arm = " file://atomic-thumb.patch \
 "
-SRC_URI_append_armv6 = " file://gatomic_armv6.patch;apply=yes"
-SRC_URI_append_armv7a = " file://gatomic_armv6.patch;apply=yes" 
+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 33bef82..05a1342 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;apply=yes \
-  file://g_once_init_enter.patch;apply=yes \
-  file://uclibc-res_query.patch;apply=yes \
+  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;apply=yes"
-SRC_URI_append_armv6 = " file://gatomic_armv6.patch;apply=yes"
-SRC_URI_append_armv7a = " file://gatomic_armv6.patch;apply=yes" 
+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 a44d446..51a2153 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;apply=yes \
-  file://g_once_init_enter.patch;apply=yes \
-  file://gatomic-proper-pointer-get-cast.patch;apply=yes \
+  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;apply=yes"
-SRC_URI_append_armv6 = " file://gatomic_armv6.patch;apply=yes"
-SRC_URI_append_armv7a = " file://gatomic_armv6.patch;apply=yes"
+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 811ae87..56fe567 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
@@ -13,21 +13,21 @@ 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;apply=yes \
-  file://g_once_init_enter.patch;apply=yes \
-  file://gatomic-proper-pointer-get-cast.patch;apply=yes \
-  file://gio.patch;apply=yes \
-  file://gvariant.patch;apply=yes \
-  file://gasync.patch;apply=yes \
-  file://60_wait-longer-for-threads-to-die.patch;apply=yes \
+  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;apply=yes"
-SRC_URI_append_armv6 = " file://gatomic_armv6.patch;apply=yes"
-SRC_URI_append_armv7a = " file://gatomic_armv6.patch;apply=yes"
+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 ae3ae9b..2e6fa66 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;apply=yes;striplevel=2 \
-           file://visibility.patch;apply=yes \
+           file://glibinclude.patch;striplevel=2 \
+           file://visibility.patch \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;apply=yes"
+           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 7d0d326..1a483f4 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;apply=yes;striplevel=2 \
+           file://glibinclude.patch;striplevel=2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;apply=yes"
+           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 f576f13..2be60f9 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;apply=yes;striplevel=2 \
+           file://glibinclude.patch;striplevel=2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;apply=yes"
+           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 85fe668..f025046 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;apply=yes"
+           file://configure-libtool.patch"
 
 S = "${WORKDIR}/glib-${PV}"
 
diff --git a/recipes/glibc/glibc_2.10.1.bb b/recipes/glibc/glibc_2.10.1.bb
index 0ebba4b..6f0d0f6 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;apply=yes;striplevel=0 \
-           file://arm-memcpy.patch;apply=yes \
-           file://arm-longlong.patch;apply=yes \
-           file://fhs-linux-paths.patch;apply=yes \
-           file://dl-cache-libcmp.patch;apply=yes \
-           file://ldsocache-varrun.patch;apply=yes \
-           file://nptl-crosscompile.patch;apply=yes \
-	   file://glibc-check_pf.patch;apply=yes;striplevel=0 \
-           file://ldd-unbash.patch;apply=yes \
-	   file://glibc-arm-IO-acquire-lock-fix.diff;apply=yes \
+	   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;apply=yes;striplevel=0 \
-           file://arm-lowlevellock-include-tls.patch;apply=yes \
-           file://glibc-2.9-enable-binutils-2.2.patch;apply=yes \
-	   file://armv4t-interworking.patch;apply=yes \
+           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;apply=yes"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;apply=yes"
+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;apply=yes"
+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 1c164f6..8622950 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;apply=yes \
-#	   file://ldconfig.patch;apply=yes;striplevel=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;apply=yes \
-	   file://arm-asm-clobber.patch;apply=yes \
-	   file://arm-ctl_bus_isa.patch;apply=yes \
-	   file://cris-libc-symbols.patch;apply=yes \
-	   file://cris-stack-direction.patch;apply=yes \
-	   file://dl-machine-alpha.patch;apply=yes \
-	   file://dl-machine-arm.patch;apply=yes \
-	   file://dl-machine-m68k.patch;apply=yes \
-	   file://dl-machine-mips.patch;apply=yes \
-	   file://dl-machine-sh.patch;apply=yes \
-	   file://dl-machine-sparc.patch;apply=yes \
-	   file://errlist-1.9.patch;apply=yes \
-	   file://errlist-arm.patch;apply=yes \
-	   file://glibc-2.2.5-allow-gcc-3.4-fixup.patch;apply=yes \
-	   file://glibc-2.2.5-allow-gcc-3.4-grp.patch;apply=yes \
-	   file://glibc-2.2.5-allow-gcc-4.x-configure.patch;apply=yes \
-	   file://glibc-2.2.5-alpha-pwrite64.patch;apply=yes \
-	   file://glibc-2.2.5-arm-pwrite64.patch;apply=yes \
-	   file://glibc-2.2.5-crosstest.patch;apply=yes \
-	   file://glibc-2.2.5-crossyes.patch;apply=yes \
-	   file://glibc-2.2.5-cygwin.patch;apply=yes \
-	   file://glibc-2.2.5-hhl-powerpc-fpu.patch;apply=yes \
-	   file://glibc-2.2.5-mips-build-gmon.patch;apply=yes \
-	   file://glibc-2.2.5-mips-clone-local-label.patch;apply=yes \
-	   file://glibc-2.2.5-ppc405erratum77.patch;apply=yes \
-	   file://glibc-drow-sh.patch;apply=yes \
-	   file://glibc-test-lowram.patch;apply=yes \
-	   file://initfini-alpha.patch;apply=yes \
-	   file://initfini-sh.patch;apply=yes \
-	   file://longjmp-sparc.patch;apply=yes \
-	   file://sh-setjmp-fix.patch;apply=yes \
-	   file://sprintf-prototype.patch;apply=yes \
-	   file://sscanf.patch;apply=yes \
-	   file://unwind-arm.patch;apply=yes \
-	   file://ldd.patch;apply=yes;striplevel=0 \
-	   file://fhs-linux-paths.patch;apply=yes \
-	   file://arm-no-hwcap.patch;apply=yes;striplevel=0 \
-	   file://arm-memcpy.patch;apply=yes;striplevel=0 \
-	   file://arm-longlong.patch;apply=yes;striplevel=0 \
-	   file://arm-machine-gmon.patch;apply=yes;striplevel=0 \
-	   file://glibc-2.2.5-allow-gcc-3.4-td.patch;apply=yes \
-	   file://glibc-2.2.5-alpha-self-clobber.patch;apply=yes \
-	   file://pt-initfini-alpha.patch;apply=yes \
-	   file://pt-initfini-sh.patch;apply=yes \
-	   file://linuxthreads-2.2.5-ppc405erratum77.patch;apply=yes \
-	   file://threadparam.patch;apply=yes \
-	   file://initfini-flags.patch;apply=yes \
-	   file://pt-initfini-flags.patch;apply=yes \
-	   file://glibc-2.3.2-allow-solaris.patch;apply=yes \
+	   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;apply=yes;striplevel=0
+#	   file://makeconfig.patch;striplevel=0
 
 
 # seems to break on TLS platforms
-# SRC_URI_append_arm = " file://dyn-ldconfig.patch;apply=yes;striplevel=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 674c96e..712ad3f 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;apply=yes
-#	   file://ldconfig.patch;apply=yes;striplevel=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;apply=yes;striplevel=0 \
-	   file://makeconfig.patch;apply=yes;striplevel=0 \
-	   file://ldd.patch;apply=yes;striplevel=0 \
-	   file://fhs-linux-paths.patch;apply=yes \
-	   file://arm-no-hwcap.patch;apply=yes;striplevel=0 \
-	   file://arm-memcpy.patch;apply=yes;striplevel=0 \
-	   file://arm-longlong.patch;apply=yes;striplevel=0 \
-	   file://arm-machine-gmon.patch;apply=yes;striplevel=0 \
-	   file://glibc-fp-byteorder.patch;apply=yes \
+	   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;apply=yes;striplevel=0"
+SRC_URI_append_arm = " file://dyn-ldconfig.patch;striplevel=0"
 
-SRC_URI_append_openmn = " file://ldsocache-varrun.patch;apply=yes"
+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 e9c5457..632df5b 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;apply=yes \
-	   file://10_cvs.patch;apply=yes \
- 	   file://arm-ioperm.patch;apply=yes;striplevel=0 \
-	   file://glibc-i686-timing.patch;apply=yes \
- 	   file://makeconfig.patch;apply=yes;striplevel=0 \
-	   file://locale-es_AR.patch;apply=yes;striplevel=0 \
-	   file://ldconfig.patch;apply=yes;striplevel=0 \
- 	   file://ldd.patch;apply=yes;striplevel=0 \
- 	   file://fhs-linux-paths.patch;apply=yes \
-	   file://glibc22-nss-upgrade.patch;apply=yes \
-	   file://glibc22-eo_EO.patch;apply=yes \
-	   file://glibc22-m68k-compat.patch;apply=yes \
-	   file://glibc22-m68k-fpic.patch;apply=yes \
-	   file://glibc22-locales.patch;apply=yes;striplevel=0 \
-	   file://sparc64-fixups.patch;apply=yes \
-	   file://glibc22-ttyname-devfs.patch;apply=yes;striplevel=0 \
-	   file://powerpc-sysconf.patch;apply=yes \
- 	   file://arm-no-hwcap.patch;apply=yes;striplevel=0 \
-	   file://locales-stuff.patch;apply=yes \
-	   file://librt-mips.patch;apply=yes;striplevel=0 \
-	   file://glibc23-ctype-compat.patch;apply=yes \
-	   file://glibc23-hppa-Rminkernel.patch;apply=yes;striplevel=0 \
-	   file://glibc23-function-compat.patch;apply=yes \
-	   file://glibc23-errno.patch;apply=yes \
-	   file://glibc23-asserth-decls.patch;apply=yes;striplevel=0 \
-	   file://alpha-pic.patch;apply=yes;striplevel=0 \
-	   file://glibc23-cmov.patch;apply=yes \
-	   file://libgcc-compat-all.patch;apply=yes;striplevel=0 \
-	   file://locales-supported.patch;apply=yes;striplevel=0 \
-	   file://libgcc-compat-other.patch;apply=yes \
-	   file://s390-tls.patch;apply=yes;striplevel=0 \
-	   file://hurd-enable-ldconfig.patch;apply=yes \
-	   file://30_glibc232-base.patch;apply=yes;striplevel=0 \
-	   file://sparcv8-target.patch;apply=yes;striplevel=0 \
-	   file://50_glibc232-arm-dwarf2-buildfix.patch;apply=yes;striplevel=0 \
-	   file://50_glibc232-m68k-dwarf2-buildfix.patch;apply=yes \
-	   file://arm-output-format.patch;apply=yes;striplevel=0 \
-	   file://pthread-cleanup.patch;apply=yes;striplevel=0 \
-	   file://glibc-${PV}-ldconfig-tls.patch;apply=yes \
-	   file://glibc23-mips-msq.patch;apply=yes;striplevel=0 \
-	   file://glibc23-libio-compat.patch;apply=yes \
-	   file://80_glibc232-locales-nb_NO-fix.patch;apply=yes;striplevel=0 \
-	   file://ldso-disable-hwcap.patch;apply=yes \
-	   file://11_shlib-lds.patch;apply=yes \
-	   file://glibc23-version-sanity.patch;apply=yes \
-	   file://glibc23-sse-oldkernel.patch;apply=yes \
-	   file://glibc23-sparc-pread64.patch;apply=yes \
-	   file://glibc23-powerpc-sigcontext.patch;apply=yes \
-	   file://hppa-syscall.patch;apply=yes;striplevel=0 \
-	   file://glibc23-errno-hack.patch;apply=yes \
-	   file://90_glibc232-statvfs.patch;apply=yes;striplevel=0 \
-	   file://90_glibc232-timezones.patch;apply=yes;striplevel=0 \
- 	   file://arm-memcpy.patch;apply=yes;striplevel=0 \
- 	   file://arm-longlong.patch;apply=yes;striplevel=0 \
- 	   file://arm-machine-gmon.patch;apply=yes;striplevel=0 \
-           file://dyn-ldconfig.diff;apply=yes;striplevel=0 \
-	   file://glibc232-gcc34-i386-fixup-attribute.patch;apply=yes \
-	   file://glibc232-gcc34-no-unit-at-a-time.patch;apply=yes \
+	   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;apply=yes \
-                         file://allow-gcc.patch;apply=yes "
-SRC_URI_append_mtx-2 = " file://mips-abio32.patch;apply=yes \
-                         file://allow-gcc.patch;apply=yes "
+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 534b684..b1e5509 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;apply=yes
-#	   file://ldconfig.patch;apply=yes;striplevel=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;apply=yes;striplevel=0 \
-	   file://ldd.patch;apply=yes;striplevel=0 \
-	   file://fhs-linux-paths.patch;apply=yes \
-	   file://arm-no-hwcap.patch;apply=yes;striplevel=0 \
-	   file://arm-memcpy.patch;apply=yes;striplevel=0 \
-	   file://arm-longlong.patch;apply=yes;striplevel=0 \
-	   file://arm-machine-gmon.patch;apply=yes;striplevel=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;apply=yes"
+SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch"
 
-SRC_URI_append_openmn = " file://ldsocache-varrun.patch;apply=yes"
+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 8db3f89..3164a57 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;apply=yes
-#	   file://ldconfig.patch;apply=yes;striplevel=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;apply=yes;striplevel=0 \
-	   file://fhs-linux-paths.patch;apply=yes \
-	   file://arm-no-hwcap.patch;apply=yes;striplevel=0 \
-	   file://arm-memcpy.patch;apply=yes;striplevel=0 \
-	   file://arm-longlong.patch;apply=yes;striplevel=0 \
-	   file://arm-machine-gmon.patch;apply=yes;striplevel=0 \
-	   file://trampoline.patch;apply=yes;striplevel=0 \
-	   file://dl-cache-libcmp.patch;apply=yes \
+	   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;apply=yes"
+SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch"
 
-SRC_URI_append_openmn = " file://ldsocache-varrun.patch;apply=yes"
+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 7294258..1169d42 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;apply=yes
-#	   file://ldconfig.patch;apply=yes;striplevel=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;apply=yes;striplevel=0 \
-	   file://fhs-linux-paths.patch;apply=yes \
-	   file://arm-no-hwcap.patch;apply=yes;striplevel=0 \
-	   file://arm-memcpy.patch;apply=yes;striplevel=0 \
-	   file://arm-longlong.patch;apply=yes;striplevel=0 \
-	   file://arm-machine-gmon.patch;apply=yes;striplevel=0 \
-	   file://trampoline.patch;apply=yes;striplevel=0 \
+	   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;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;apply=yes"
+SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch"
 
-SRC_URI_append_openmn = " file://ldsocache-varrun.patch;apply=yes"
+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 bc77d75..6e0ed6b 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;apply=yes \
-                         file://allow-gcc.patch;apply=yes "
-SRC_URI_append_mtx-2 = " file://mips-abio32.patch;apply=yes \
-                         file://allow-gcc.patch;apply=yes "
+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 8426796..2124453 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;apply=yes
-#	   file://ldconfig.patch;apply=yes;striplevel=0
-#	   file://arm-machine-gmon.patch;apply=yes;striplevel=0 \
+#	   file://noinfo.patch
+#	   file://ldconfig.patch;striplevel=0
+#	   file://arm-machine-gmon.patch;striplevel=0 \
 #	   \
-#	   file://arm-ioperm.patch;apply=yes;striplevel=0 \
-#	   file://ldd.patch;apply=yes;striplevel=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;apply=yes \
-	   file://arm-audit2.patch;apply=yes \
-	   file://arm-no-hwcap.patch;apply=yes \
-	   file://arm-memcpy.patch;apply=yes \
-	   file://arm-longlong.patch;apply=yes;striplevel=0 \
-	   file://fhs-linux-paths.patch;apply=yes \
-	   file://dl-cache-libcmp.patch;apply=yes \
-	   file://ldsocache-varrun.patch;apply=yes \
-	   file://5090_all_stubs-rule-fix.patch;apply=yes \
-	   file://raise.patch;apply=yes \
-	   file://zecke-sane-readelf.patch;apply=yes \
-	   file://glibc-2.3.5-fix-weak-alias-arm.patch;apply=yes \
-	   file://glibc-2.3.5-fix-weak-alias-arm-2.patch;apply=yes \
+	   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;apply=yes"
-SRC_URI_append_armeb = " file://dyn-ldconfig-20041128.patch;apply=yes"
+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;apply=yes \
-                       file://superh-fcntl.patch;apply=yes;striplevel=0"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;apply=yes \
-                       file://superh-fcntl.patch;apply=yes;striplevel=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 8d20c60..a2b2953 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;apply=yes
+#           ${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;apply=yes;name=crosspatch1 \
-           ${CROSSTOOL_PATCH_URL}glibc-2.3.5-sh-memset.patch;apply=yes;name=crosspatch2 \
-           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-allow-gcc-4.0-arm.patch;apply=yes;name=crosspatch3 \
-           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-allow-gcc-4.0-elf.patch;apply=yes;name=crosspatch4 \
-           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-configure-apple-as.patch;apply=yes;name=crosspatch5 \
-           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-fix-pr631.patch;apply=yes;name=crosspatch6 \
-           ${CROSSTOOL_PATCH_URL}glibc-fp-byteorder.patch;apply=yes;name=crosspatch7 \
-           ${CROSSTOOL_PATCH_URL}glibc-mips-bootstrap-gcc-header-install.patch;apply=yes;name=crosspatch8 \
-           ${CROSSTOOL_PATCH_URL}arm-ctl_bus_isa.patch;apply=yes;name=crosspatch9 \
-           ${CROSSTOOL_PATCH_URL}make-install-lib-all.patch;apply=yes;name=crosspatch10 \
-           ${CROSSTOOL_PATCH_URL}maybe/glibc-2.3.6-allow-gcc-4.0-powerpc32.patch;apply=yes;name=crosspatch11 \
-           file://glibc-2.3.6-bind-already-defined-on-powerpc.patch;apply=yes \
-           file://glibc-2.3.6-allow-gcc-4.1-powerpc32-initfini.s.patch;apply=yes \
-           file://glibc-2.3.6-linuxthreads-allow-gcc-4.1-powerpc32-initfini.s.patch;apply=yes \
-           file://late-install-loop-break.patch;apply=yes \
-           file://glibc-arm-socket-weakalias.patch;apply=yes \
-           file://glibc-2.3.6-linuxthreads-pthread-raise.patch;apply=yes \
-           file://glibc-cross_sunrpc.patch;apply=yes \
+           ${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"
 
diff --git a/recipes/glibc/glibc_2.4.bb b/recipes/glibc/glibc_2.4.bb
index acf662c..cba0fb3 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;apply=yes
-#	   file://ldconfig.patch;apply=yes;striplevel=0
-#	   file://arm-machine-gmon.patch;apply=yes;striplevel=0 \
+#	   file://noinfo.patch
+#	   file://ldconfig.patch;striplevel=0
+#	   file://arm-machine-gmon.patch;striplevel=0 \
 #	   \
-#	   file://arm-ioperm.patch;apply=yes;striplevel=0 \
-#	   file://ldd.patch;apply=yes;striplevel=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;apply=yes \
-           file://arm-longlong.patch;apply=yes \
-           file://fhs-linux-paths.patch;apply=yes \
-           file://dl-cache-libcmp.patch;apply=yes \
-           file://ldsocache-varrun.patch;apply=yes \
-           file://nptl-crosscompile.patch;apply=yes \
-	   file://glibc-2.4-compile.patch;apply=yes \
-	   file://glibc-2.4-openat-3.patch;apply=yes \
-	   file://fixup-aeabi-syscalls.patch;apply=yes \
-	   file://zecke-sane-readelf.patch;apply=yes \
-	   file://arm_eabi_ipc_fix.patch;apply=yes \
+           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;apply=yes"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;apply=yes"
+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 e3228e2..06b813d 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;apply=yes \
-  file://arm-longlong.patch;apply=yes \
-  file://fhs-linux-paths.patch;apply=yes \
-  file://dl-cache-libcmp.patch;apply=yes \
-  file://ldsocache-varrun.patch;apply=yes \
-  file://nptl-crosscompile.patch;apply=yes \
-  file://glibc-2.5-local-dynamic-resolvconf.patch;apply=yes;striplevel=0 \
-  file://glibc-check_pf.patch;apply=yes;striplevel=0 \
-  file://zecke-sane-readelf.patch;apply=yes \
-  file://ldd-unbash.patch;apply=yes \
-  file://glibc-2.6.1-use-short-for-fnstsw.patch;apply=yes \
-  file://glibc-arm-no-asm-page.patch;apply=yes \
+  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;apply=yes"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;apply=yes"
+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;apply=yes \
-                           file://ppc-soft-fp-20070115.patch;apply=yes \
-                           file://ppc-ld-nofpu-20070104.patch;apply=yes \
-                           file://ppc-ports-ld-nofpu-20070114.patch;apply=yes \
-                           file://powerpc-sqrt-hack.diff;apply=yes \
-                           file://glibc-2.5-soft-fp-separate-strong-alias.patch;apply=yes"
+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 104ce88..8acfeff 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;apply=yes \
-  file://arm-longlong.patch;apply=yes \
-  file://fhs-linux-paths.patch;apply=yes \
-  file://dl-cache-libcmp.patch;apply=yes \
-  file://nptl-crosscompile.patch;apply=yes \
-  file://glibc-2.5-local-dynamic-resolvconf.patch;apply=yes;striplevel=0 \
-  file://glibc-check_pf.patch;apply=yes;striplevel=0 \
-  file://zecke-sane-readelf.patch;apply=yes \
-  file://ldd-unbash.patch;apply=yes \
+  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;apply=yes \
-  file://glibc-2.6.1-use-short-for-fnstsw.patch;apply=yes \
-  file://glibc-use-isystem-include-fixed.patch;apply=yes \
-  file://glibc-arm-no-asm-page.patch;apply=yes \
-  file://armv4t-interworking.patch;apply=yes \
-  file://march-i686.patch;apply=yes;striplevel=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;apply=yes \
-  file://glibc-crunch-eabi-setjmp_longjmp.patch;apply=yes \
-  file://glibc-crunch-eabi-unwind.patch;apply=yes \
-  file://glibc-crunch-eabi.patch;apply=yes \
-  file://glibc-crunch-eabi-force.patch;apply=yes \
-  file://glibc-crunch-eabi-fraiseexcpt.patch;apply=yes \
+  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;apply=yes"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;apply=yes"
+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;apply=yes \
-  file://glibc-2.6.1-powerpc-nofpu.patch;apply=yes \
+  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 4357a5b..2f2fc36 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;apply=yes
-#	   file://ldconfig.patch;apply=yes;striplevel=0
-#	   file://arm-machine-gmon.patch;apply=yes;striplevel=0 \
+#	   file://noinfo.patch
+#	   file://ldconfig.patch;striplevel=0
+#	   file://arm-machine-gmon.patch;striplevel=0 \
 #	   \
-#	   file://arm-ioperm.patch;apply=yes;striplevel=0 \
-#	   file://ldd.patch;apply=yes;striplevel=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;apply=yes \
-           file://arm-longlong.patch;apply=yes \
-           file://fhs-linux-paths.patch;apply=yes \
-           file://dl-cache-libcmp.patch;apply=yes \
-           file://ldsocache-varrun.patch;apply=yes \
-           file://nptl-crosscompile.patch;apply=yes \
-	   file://glibc-check_pf.patch;apply=yes;striplevel=0 \
-#	   file://glibc-2.4-compile.patch;apply=yes \
-#	   file://glibc-2.4-openat-3.patch;apply=yes \
-#	   file://fixup-aeabi-syscalls.patch;apply=yes \
-#	   file://zecke-sane-readelf.patch;apply=yes \
-           file://ldd-unbash.patch;apply=yes \
-	   file://glibc-arm-IO-acquire-lock-fix.diff;apply=yes \
-	   file://all_glibc-i586-chk.patch;apply=yes \
-	   file://glibc-2.6.1-use-short-for-fnstsw.patch;apply=yes \
-           file://glibc-use-isystem-include-fixed.patch;apply=yes \
+           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;apply=yes;striplevel=0 \
-	   file://glibc-arm-no-asm-page.patch;apply=yes \
+           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;apply=yes"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;apply=yes"
+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;apply=yes"
+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 ab5ddcb..e7ab63d 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;apply=yes
-#	   file://ldconfig.patch;apply=yes;striplevel=0
-#	   file://arm-machine-gmon.patch;apply=yes;striplevel=0 \
+#	   file://noinfo.patch
+#	   file://ldconfig.patch;striplevel=0
+#	   file://arm-machine-gmon.patch;striplevel=0 \
 #	   \
-#	   file://arm-ioperm.patch;apply=yes;striplevel=0 \
-#	   file://ldd.patch;apply=yes;striplevel=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;apply=yes;striplevel=0 \
-           file://arm-memcpy.patch;apply=yes \
-           file://arm-longlong.patch;apply=yes \
-           file://fhs-linux-paths.patch;apply=yes \
-           file://dl-cache-libcmp.patch;apply=yes \
-           file://ldsocache-varrun.patch;apply=yes \
-           file://nptl-crosscompile.patch;apply=yes \
-	   file://glibc-check_pf.patch;apply=yes;striplevel=0 \
-           file://ldd-unbash.patch;apply=yes \
-	   file://glibc-arm-IO-acquire-lock-fix.diff;apply=yes \
+	   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;apply=yes;striplevel=0 \
-	   file://tls_i486.patch;apply=yes \
-	   file://glibc-2.9-use-_begin.patch;apply=yes \
-           file://arm-lowlevellock-include-tls.patch;apply=yes \
-           file://glibc-2.9-enable-binutils-2.2.patch;apply=yes \
+           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;apply=yes \
-                   file://0002-malloc-memusage.c-DEFAULT_BUFFER_SIZE-Change-to-3276.patch;apply=yes \
-                   file://0003-Fix-wrap-around-in-memusage.patch;apply=yes "
+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;apply=yes \
-		file://glibc-2.9-sh-fix.patch;apply=yes"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;apply=yes \
-		file://glibc-2.9-sh-fix.patch;apply=yes"
+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;apply=yes"
+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 efc1dca..1c7a785 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;apply=yes
-#	   file://ldconfig.patch;apply=yes;striplevel=0
-#	   file://arm-no-hwcap.patch;apply=yes;striplevel=0 \
-#	   file://arm-memcpy.patch;apply=yes;striplevel=0 \
-#	   file://arm-machine-gmon.patch;apply=yes;striplevel=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;apply=yes;striplevel=0 \
-#	   file://ldd.patch;apply=yes;striplevel=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;apply=yes;striplevel=0 \
-	   file://arm-audit.patch;apply=yes \
-	   file://arm-audit2.patch;apply=yes \
-	   file://arm-memcpy.patch;apply=yes \
-	   file://arm-longlong.patch;apply=yes;striplevel=0 \
-	   file://fhs-linux-paths.patch;apply=yes \
-	   file://dl-cache-libcmp.patch;apply=yes \
-	   file://ldsocache-varrun.patch;apply=yes \
+	   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;apply=yes"
+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 d94a9dc..2f76941 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;apply=yes"
+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 b9cff03..be5a885 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;apply=yes"
+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 d6115e3..8424d29 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;apply=yes"
+	   file://gloox-fix-pc.diff"
 
 do_stage () {
 	autotools_stage_all
diff --git a/recipes/gmp/gmp.inc b/recipes/gmp/gmp.inc
index 0a84e19..6011223 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;apply=yes \
-	   file://amd64.patch;apply=yes"
+	   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 eae4c9f..2b814ce 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;apply=yes"
+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 ea02996..18d8889 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;apply=yes"
+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 342fc00..8d1444d 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;apply=yes \
-                   file://x86-fat.diff;apply=yes;striplevel=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 b30396e..c8c1d68 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;apply=yes \
-		   file://03_gnu89-inline.diff;apply=yes \
-		   file://mpf_set_str_c.diff;apply=yes \
-		   file://sh4-asmfix.patch;apply=yes \
+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 f517c02..963a462 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;apply=yes \
-                   file://use-includedir.patch;apply=yes \
-                   file://dont_use_mips_h_constraint.patch;apply=yes \
+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 f2d5edc..fecb3a0 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;apply=yes"
+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 7154130..8503199 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;apply=yes file://libintl.patch;patch=1"
+SRC_URI += "file://libtool-2.2.patch file://libintl.patch;patch=1"
 
 
 
diff --git a/recipes/gnash/gnash-minimal_cvs.bb b/recipes/gnash/gnash-minimal_cvs.bb
index 740e403..fcef623 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;apply=yes \
-            file://libintl.patch;apply=yes \
-            file://fix-trunc.diff;apply=yes"
+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 ac532c8..f3bb166 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;apply=yes"
+SRC_URI += "file://libtool-2.2.patch"
 
 
 SRC_URI[md5sum] = "5033ef2602ea1234a9ccb73000a0dedb"
diff --git a/recipes/gnet/gnet_cvs.bb b/recipes/gnet/gnet_cvs.bb
index 03be405..93a257c 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;apply=yes"
+           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 6db5f07..102cb97 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;apply=yes \
-           file://configure_fix.patch;apply=yes \
-           file://pkgconfig_fix.patch;apply=yes "
+           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 a2cd684..569d9a2 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;apply=yes"
+	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 7f1ffc4..2389980 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;apply=yes"
+	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 86fd67b..932d6e9 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;apply=yes;striplevel=0 \
+           file://gecko-mplayer-svn.diff;striplevel=0 \
            file://extensions \
 "
 
diff --git a/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb b/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb
index 253be93..32215aa 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;apply=yes;striplevel=0 \
-            file://default.patch;apply=yes \
+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 1074c2d..8dd85ce 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;apply=yes \
+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 7cf2beb..b52c01f 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;apply=yes \
+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 7dc0100..77b121a 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;apply=yes \
+           file://default.patch \
 "
 
 # Untested
diff --git a/recipes/gnome/epiphany_2.21.92.bb b/recipes/gnome/epiphany_2.21.92.bb
index 9561c2b..b9c6691 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;apply=yes"
+SRC_URI_append = " file://file_contains.patch"
 
 EXTRA_OECONF = "--with-engine=webkit --with-distributor-name=${DISTRO}"
 
diff --git a/recipes/gnome/gconf_2.6.1.bb b/recipes/gnome/gconf_2.6.1.bb
index ee9579c..da112f7 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;apply=yes"
+	   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 449fa37..85bc216 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;apply=yes"
+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 83d43d7..0c6050d 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;apply=yes \
+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 29545bd..40d9c36 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;apply=yes \
-            file://gdm-xklavier.patch;apply=yes \
+            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 b4e2ebf..0fb6883 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;apply=yes \
+            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 39b8740..7352bf3 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;apply=yes \
+            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 6126603..826052f 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;apply=yes"
+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 ce62d31..f036475 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;apply=yes \
-            file://no-desktop-docs.patch;apply=yes;striplevel=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 845ec3e..fb30071 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;apply=yes \
-            file://no-desktop-docs.patch;apply=yes;striplevel=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 f8aa72b..ec3cf23 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;apply=yes \
-            file://no-desktop-docs.patch;apply=yes;striplevel=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 34092df..d1959b1 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;apply=yes \
-            file://no-desktop-docs.patch;apply=yes;striplevel=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 532e2ec..28e063a 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;apply=yes;striplevel=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 8b1b3b8..9a99d27 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;apply=yes;striplevel=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 bcccc7d..75dc075 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;apply=yes;striplevel=0"
+SRC_URI += "file://no-desktop-docs.patch;striplevel=0"
diff --git a/recipes/gnome/gnome-games_2.24.3.bb b/recipes/gnome/gnome-games_2.24.3.bb
index f1eed7a..07b3081 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;apply=yes \
+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 74b7824..dceb070 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;apply=yes"
+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 7f79eca..d34343d 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;apply=yes"
+SRC_URI += "file://scrollkeeper.patch"
 
-SRC_URI += "file://idl-sysroot.patch;apply=yes"
+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 c0a4780..7511f9a 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;apply=yes"
+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 e3a83a1..fb5036c 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;apply=yes"
+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 3bb83f0..cfe2cfe 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;apply=yes"
+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 48d491c..364720f 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;apply=yes"
+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 12646c9..3bb5af6 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;apply=yes"
+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 a89de02..c53a83e 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;apply=yes"
+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 dafa1d5..9b008ac 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;apply=yes"
+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 a70e6c7..b2f39cf 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;apply=yes"
+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 98ef193..d3d24b1 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;apply=yes \
-	    file://gnome-vfs-no-kerberos.patch;apply=yes;striplevel=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 1d18399..3902e77 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;apply=yes \
-	    file://gnome-vfs-no-kerberos.patch;apply=yes;striplevel=0 \
-	    file://03_gnutls27.patch;apply=yes"
+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 4e5964c..5b8240a 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;apply=yes "
+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 b00ae31..97addde 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;apply=yes"
+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 f7b6ea1..1bcd997 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;apply=yes "
+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 b9aa580..e40cb1a 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;apply=yes \
-             file://nodolt.patch;apply=yes "
+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 70640ef..6ef4fbf 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;apply=yes \
-             file://nodolt.patch;apply=yes "
+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 52175b3..4968d92 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;apply=yes \
-            file://imobile-fix2.patch;apply=yes \
+            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 a727719..aa06237 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;apply=yes"
+       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 99a77c8..7349bf7 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;apply=yes"
+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 fb45f09..2133cf2 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;apply=yes"
+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 4730827..a532ade 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;apply=yes"
+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 78a042a..630c261 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;apply=yes"
+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 76e58cf..4bf97ea 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;apply=yes"
+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 e3ef83a..b3b6803 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;apply=yes"
+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 b0d9f85..3cf274a 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;apply=yes"
+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 07ade9c..98d5375 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;apply=yes"
+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 d6e8908..dedfbbc 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;apply=yes"
+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 09e9a59..eb8a909 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;apply=yes \
+	   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 de14d30..d602879 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;apply=yes "
+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 6b07691..78448b6 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;apply=yes \
+           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 a248647..aaf2b38 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;apply=yes \
+           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 4545ebb..bf69e99 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;apply=yes \
+           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 14ee627..157d8d9 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;apply=yes \
-           file://pkgconfig-fix.patch;apply=yes \
+           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 c931c47..dbcbc50 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;apply=yes \
+           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 bdcfa75..33f5e91 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;apply=yes \
+           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 f8d34bc..ca4d102 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;apply=yes \
+            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 5c01411..2bf4915 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;apply=yes \
+            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 9ddc891..16bc05f 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;apply=yes \
+            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 d155190..d924d81 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;apply=yes \
+            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 b782cfc..178f0c9 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;apply=yes \
-           file://avr32.patch;apply=yes \
+	   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 a0d40ce..c2ad342 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;apply=yes \
+           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 76eebea..93bc465 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;apply=yes"
+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 a500042..c0b79c7 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;apply=yes \
-	   file://debian-separate-x11-package.patch;apply=yes \
+	   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;apply=yes \
-   	   file://term.patch;apply=yes \
+	   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 5e48ab9..3621727 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;apply=yes \
-           file://term.patch;apply=yes \
+	   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 134ef5c..bc4727d 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;apply=yes \
+       file://subdirs.patch \
 	   file://gnuplot.desktop \
 	   file://gnuplot.png"
 
diff --git a/recipes/gnuplot/gnuplot_cvs.bb b/recipes/gnuplot/gnuplot_cvs.bb
index a034c30..212164c 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;apply=yes \
-           file://term.patch;apply=yes \
+           file://subdirs.patch \
+           file://term.patch \
            file://gnuplot.desktop \
            file://gnuplot.png"
 
diff --git a/recipes/gnuradio/gnuradio_3.2.0.bb b/recipes/gnuradio/gnuradio_3.2.0.bb
index c9f6c75..4769e0b 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;apply=yes \
-    file://gnuradio-neon.patch;apply=yes;striplevel=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 1350b6f..5744f2d 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;apply=yes \
-    file://gnuradio-neon.patch;apply=yes;striplevel=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/gnutls/gnutls_2.8.5.bb b/recipes/gnutls/gnutls_2.8.5.bb
index 787e0a5..b0786f6 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;apply=yes \
-	file://gnutls-replace-siginterrupt.patch;apply=yes \
+	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 342a3b6..5f0581f 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;apply=yes \
-	   file://gparted-0.3.3-llabs.patch;apply=yes;striplevel=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 0dc4008..9652804 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;apply=yes \
+           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 3ad119c..751d164 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;apply=yes;striplevel=0 \
-	    file://fix_makefile.patch;apply=yes"
+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 fa24922..5d5146d 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;apply=yes;striplevel=0 \
-	    file://fix_makefile.patch;apply=yes"
+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 d456a96..178b63e 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;apply=yes;striplevel=0 \
-	    file://fix_makefile.patch;apply=yes"
+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 ea217a7..53f443f 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;apply=yes \
-            file://fix-install.diff;apply=yes \
+            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 aff5eb7..e658254 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;apply=yes"
+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 80b5bb1..b756962 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;apply=yes file://cairo-fixes.patch;patch=1"
+SRC_URI += " file://no-render-h.patch file://cairo-fixes.patch;patch=1"
 
 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 069fef7..aa1efee 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;apply=yes"
+           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 49a1573..b9e8210 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;apply=yes \
-	    file://makefile-fix.patch;apply=yes"
+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 e371a35..dfd1393 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;apply=yes \
-	    file://makefile-fix.patch;apply=yes"
+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 1b18cf9..1b16bf5 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;apply=yes"
+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 c4b110c..99ef22a 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;apply=yes"
+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 9fcde51..16ac050 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;apply=yes"
+           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 91788b8..6252ed9 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;apply=yes;striplevel=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 a5cb651..19fcbd3 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;apply=yes;striplevel=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 14589fb..99e8db1 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;apply=yes"
+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 95a8025..cee9b9f 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;apply=yes \
-	file://include-sdp_lib.patch;apply=yes"
+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 e8dfa5c..ae15a9b 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;apply=yes"
+            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 180cbd7..406cabb 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;apply=yes \
-            file://cxx0-rotation.patch;apply=yes \
-            file://cairofix.patch;apply=yes \
-            file://no-strip-on-install.patch;apply=yes"
+            file://c7x0-rotation.patch \
+            file://cxx0-rotation.patch \
+            file://cairofix.patch \
+            file://no-strip-on-install.patch"
 
-SRC_URI_append_mnci = " file://mnci.patch;apply=yes"
+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 3ce18d5..7af2631 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;apply=yes \
-	    file://no-strip-on-install.patch;apply=yes"
+	    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 890c677..4cfbd5b 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;apply=yes \
-	    file://svn-build.patch;apply=yes"
+            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 3593eb3..4d7451d 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;apply=yes"
+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 d31a98a..2544d35 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;apply=yes"
+	   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 a1e0bab..bb2b63b 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;apply=yes"
+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 073ea41..011db87 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;apply=yes"
+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 dce320d..e7b6f79 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;apply=yes"
+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 8f4c247..e3e9a2a 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;apply=yes"
+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 92a08ca..8367409 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;apply=yes"
+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 aaa44e1..a76f6cf 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;apply=yes"
+           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 6117d6d..2c964eb 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;apply=yes;striplevel=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 5d6c9c8..e277e18 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;apply=yes \
-            file://wireless.patch;apply=yes"
+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 3160074..5a2c32a 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;apply=yes \
-            file://wifi-key.patch;apply=yes;striplevel=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 a7026d6..23d75c4 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;apply=yes"
+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 c1b6231..e167182 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;apply=yes"
+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 68832f0..fb9929c 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;apply=yes"
+	   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 3379f5b..d071eca 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;apply=yes"
+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 e1efb77..f3ef5c2 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;apply=yes"
+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 3c01ad2..1930ae9 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;apply=yes"
+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 606d6ee..4fdd44c 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;apply=yes"
-SRC_URI += " file://chvt-keylaunch.patch;apply=yes "
-SRC_URI += " file://c-locale.patch;apply=yes "
+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;apply=yes"
-SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;apply=yes"
-SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;apply=yes"
+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 074551d..4dcc79c 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;apply=yes"
-SRC_URI += " file://chvt-keylaunch.patch;apply=yes "
-SRC_URI += " file://c-locale.patch;apply=yes "
-SRC_URI += " file://no-deprecated-sysfs.patch;apply=yes "
-
-SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;apply=yes"
-SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;apply=yes"
-SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;apply=yes"
+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 d38ec12..87ac97f 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;apply=yes"
+	   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 bdd8fe6..5601180 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;apply=yes"
+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 6c5e44b..b320318 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;apply=yes"
+	   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 a1e6b51..d049c60 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;apply=yes \
-	    file://fix-install.patch;apply=yes"
+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 8ecf4bb..a5646dc 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;apply=yes"
+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 b608726..c80f78d 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;apply=yes;striplevel=0 \
-             file://fix-includepath.patch;apply=yes"
+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 244cbd2..1cb9e3f 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;apply=yes"
+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 d6d91c4..6bedd8a 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;apply=yes;striplevel=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 6c28a06..482e919 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;apply=yes"
+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 cd88669..8bfaffb 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;apply=yes" 
+	    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 02b4832..424ba32 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;apply=yes \
-	    file://nostropts.patch;apply=yes"
+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 aeb6b68..81f9b2f 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;apply=yes \
-		file://search.patch;apply=yes \
+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 e5de57a..77fd48e 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;apply=yes \
+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 b862ccd..3a37f9d 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;apply=yes \
-           file://fix-install.patch;apply=yes \
+           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 b04ec73..ffcf999 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;apply=yes"
+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 42ba7e0..899b872 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;apply=yes;striplevel=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 03b834f..edbe529 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;apply=yes"
+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 65eef73..1b1e81f 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;apply=yes"
-SRC_URI_append_spitz = " file://highdpifontfix.patch;apply=yes"
-SRC_URI_append_akita = " file://highdpifontfix.patch;apply=yes"
-SRC_URI_append_c7x0 = " file://highdpifontfix.patch;apply=yes"
-SRC_URI_append_nokia770 = " file://highdpifontfix.patch;apply=yes"
+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 c0ae1f4..66bf64a 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;apply=yes"
-SRC_URI_append_spitz = " file://highdpifontfix.patch;apply=yes"
-SRC_URI_append_akita = " file://highdpifontfix.patch;apply=yes"
-SRC_URI_append_c7x0 = " file://highdpifontfix.patch;apply=yes"
-SRC_URI_append_nokia770 = " file://highdpifontfix.patch;apply=yes"
+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 45af04a..c7ee88a 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;apply=yes "
+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 3ece10c..bfa9b36 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;apply=yes;striplevel=0 \
-	   file://remove-render.patch;apply=yes"
+	   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 af57813..d0a9b51 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;apply=yes \
+  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 a30656a..e8bd309 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;apply=yes"
+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 b5044c5..b28d0e6 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;apply=yes \
-	    file://makefile-fix.patch;apply=yes"
+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 f4a7dca..d5ba579 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;apply=yes"
+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 f8ac0f0..c8ae9cc 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;apply=yes"
+           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 4e44fd9..4f7a889 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;apply=yes"
+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 4ae257f..f44c793 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;apply=yes"
+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 763b5f0..537b344 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;apply=yes"
+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 de5c90b..e6f9077 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;apply=yes"
+SRC_URI += "file://setlocale.patch"
 
-SRC_URI += "file://makefile-fix.patch;apply=yes"
+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 535e2ef..80fbe7a 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;apply=yes \
+	   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 c4ddb0c..c802768 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;apply=yes"
+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 a69ac6f..bfd371b 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;apply=yes"
+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 fd9d4e3..a053620 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;apply=yes"
+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 4c86d27..bcb8bcb 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;apply=yes \
-            file://fix_install.patch;apply=yes \
-            file://no-render-h.patch;apply=yes \
+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 1552102..e78275e 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;apply=yes"
+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 11fce7b..1c2384d 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;apply=yes;striplevel=0"
+SRC_URI += " file://set-wm-hint.patch;striplevel=0"
 
 SRC_URI[md5sum] = "f04e358d686a48157248a7a3ba115bf9"
 SRC_URI[sha256sum] = "35b4b6a48f09221c220fb397a3db8725c3c1053a950534310db719fc71123736"
diff --git a/recipes/gpephone/calendar2_svn.bb b/recipes/gpephone/calendar2_svn.bb
index 62b946f..a5a09a4 100644
--- a/recipes/gpephone/calendar2_svn.bb
+++ b/recipes/gpephone/calendar2_svn.bb
@@ -10,7 +10,7 @@ DEPENDS = "gtk+ libgpewidget libgpephone libgemwidget dbus-glib libcalenabler2 l
 inherit gpephone autotools
 
 SRC_URI = "${GPEPHONE_SVN} \
-           file://disable-broken-tests.patch;apply=yes"
+           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 89d5d2e..3e13c15 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;apply=yes"
+           file://oe-install.patch"
 
 
 S  = ${WORKDIR}/GPRS/cms92init-simple
diff --git a/recipes/gpephone/gpe-applauncher_0.7.bb b/recipes/gpephone/gpe-applauncher_0.7.bb
index 062d405..6db12c7 100644
--- a/recipes/gpephone/gpe-applauncher_0.7.bb
+++ b/recipes/gpephone/gpe-applauncher_0.7.bb
@@ -9,7 +9,7 @@ DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libxsettings-cli
 GPE_TARBALL_SUFFIX= "gz"
 inherit gpephone autotools
 
-SRC_URI += " file://default-icon.patch;apply=yes;striplevel=0"
+SRC_URI += " file://default-icon.patch;striplevel=0"
 
 #EXTRA_OECONF = "--enable-gridlayout"
 
diff --git a/recipes/gpephone/gpe-session-scripts-phone_0.67.bb b/recipes/gpephone/gpe-session-scripts-phone_0.67.bb
index 59b78d4..a1fdeb3 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;apply=yes"
+           file://standard-apps.patch"
 
 PR = "r10"
 
diff --git a/recipes/gpephone/gsmmux_alpha-2.bb b/recipes/gpephone/gsmmux_alpha-2.bb
index ff9acdb..9c7c9fc 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;apply=yes;striplevel=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 960bb87..cf70030 100644
--- a/recipes/gpephone/libabenabler2_1.0.bb
+++ b/recipes/gpephone/libabenabler2_1.0.bb
@@ -8,7 +8,7 @@ PR          = "r1"
 GPE_TARBALL_SUFFIX = "bz2"
 inherit gpephone pkgconfig autotools
 
-SRC_URI += "file://i18n.patch;apply=yes"
+SRC_URI += "file://i18n.patch"
 
 FILES_${PN} += "${datadir}/contact ${libdir}/lips/*.so"
 FILES_${PN}-dbg += "${libdir}/lips/.debug/*.so"
diff --git a/recipes/gpephone/libchenabler_0.1.bb b/recipes/gpephone/libchenabler_0.1.bb
index 6f874c5..adbe3aa 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;apply=yes"
+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 8512ce1..16a7bba 100644
--- a/recipes/gpephone/libgemwidget_0.1.bb
+++ b/recipes/gpephone/libgemwidget_0.1.bb
@@ -10,7 +10,7 @@ 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;apply=yes"
+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 6452c51..186cae4 100644
--- a/recipes/gpephone/libgemwidget_1.0.bb
+++ b/recipes/gpephone/libgemwidget_1.0.bb
@@ -8,7 +8,7 @@ PR          = "r0"
 GPE_TARBALL_SUFFIX = "bz2"
 inherit gpephone pkgconfig autotools
 
-SRC_URI += " file://disable-tests.patch;apply=yes file://libgemwidget-fixup.diff;patch=1"
+SRC_URI += " file://disable-tests.patch file://libgemwidget-fixup.diff;patch=1"
 
 FILES_${PN} += "${datadir}/gem"
 
diff --git a/recipes/gpephone/libiac2_svn.bb b/recipes/gpephone/libiac2_svn.bb
index afd8779..fbec409 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;apply=yes;striplevel=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 1461ca0..d33a109 100644
--- a/recipes/gpephone/libiac_0.1.bb
+++ b/recipes/gpephone/libiac_0.1.bb
@@ -8,7 +8,7 @@ PR          = "r2"
 GPE_TARBALL_SUFFIX = "bz2"
 inherit gpephone pkgconfig autotools
 
-SRC_URI += "file://po.patch;apply=yes"
+SRC_URI += "file://po.patch"
 
 do_stage () {
 	autotools_stage_all
diff --git a/recipes/gpephone/libim2_svn.bb b/recipes/gpephone/libim2_svn.bb
index 6aa515e..337d73c 100644
--- a/recipes/gpephone/libim2_svn.bb
+++ b/recipes/gpephone/libim2_svn.bb
@@ -9,7 +9,7 @@ PR          = "r1"
 inherit gpephone pkgconfig autotools
 
 SRC_URI = "${GPEPHONE_SVN} \
-           file://disable-tests.patch;apply=yes"
+           file://disable-tests.patch"
 
 EXTRA_OECONF = "--enable-test=no"
 
diff --git a/recipes/gpephone/linphone_1.5.0.bb b/recipes/gpephone/linphone_1.5.0.bb
index 669a648..0d20693 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;apply=yes \
-           file://linphone-pkgconfig.patch;apply=yes;striplevel=0"
+           file://linphone-1.5.0.patch \
+           file://linphone-pkgconfig.patch;striplevel=0"
 
 FILES_${PN} += "${datadir}/linphonec"
 
diff --git a/recipes/gpephone/phoneserver_1.0.bb b/recipes/gpephone/phoneserver_1.0.bb
index 96f2f02..e2adf2c 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;apply=yes;striplevel=0"
-SRC_URI_append_om-gta01 = " file://phoneserver-gta01.patch;apply=yes"
+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/sms_1.0.bb b/recipes/gpephone/sms_1.0.bb
index aeeaad9..151caa3 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;apply=yes;striplevel=0"
+SRC_URI += " file://somefixes.patch;striplevel=0"
 
 FILES_${PN} += "${datadir}/conf ${datadir}/graphic"
 
diff --git a/recipes/gpephone/xoo-vm_0.7-20070204.bb b/recipes/gpephone/xoo-vm_0.7-20070204.bb
index ee2cda8..3983ea1 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;apply=yes;striplevel=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 735f22f..4f6b5ab 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;apply=yes"
+            file://autoreconf.patch"
 
 inherit autotools
 
diff --git a/recipes/gphoto2/gphoto2_2.4.2.bb b/recipes/gphoto2/gphoto2_2.4.2.bb
index d3d18c7..cd73d30 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;apply=yes"
+           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 5a748fa..1ed0a46 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;apply=yes"
+           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 5f619b2..fcb6d27 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;apply=yes"
+           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 0d36c83..ea54713 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;apply=yes"
+           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 d1681cb..5809100 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;apply=yes"
+           file://0001-Fix-musb_hdrc-EP_STATUS_NAME.patch"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/gpio-event/gpio-event.bb b/recipes/gpio-event/gpio-event.bb
index 7657b62..582c80b 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;apply=yes \
+   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 38f615c..c9422bb 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;apply=yes \
-	   file://no-docs.patch;apply=yes \
-	   file://gpm-OPEN_MAX.patch;apply=yes \
+	   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 c1df5b6..77464c7 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;apply=yes"
+           file://autotools.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/gpsd/gpsd_2.90.bb b/recipes/gpsd/gpsd_2.90.bb
index 29117fe..25c739b 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;apply=yes"
+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 bdd45c4..7c575cb 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;apply=yes \
-            file://cross-compile-on-gentoo.patch;apply=yes "
+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
index fb6ab84..5cf8b2e 100644
--- a/recipes/gpsd/gpsd_2.94.bb
+++ b/recipes/gpsd/gpsd_2.94.bb
@@ -1,6 +1,6 @@
 require gpsd.inc
 
-SRC_URI += "file://libtool.patch;apply=yes"
+SRC_URI += "file://libtool.patch"
 SRC_URI[gpsd.md5sum] = "ce70bcd707ac1df861d4c72f503c09d1"
 SRC_URI[gpsd.sha256sum] = "1520b87d106d198aa42137db4b230615dbd0d06b04e6fcc84e010172fba2da41"
 
diff --git a/recipes/gpsdrive/gpsdrive-pda_2.10pre2.bb b/recipes/gpsdrive/gpsdrive-pda_2.10pre2.bb
index caaf0a9..ea35796 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;apply=yes "
+	   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 54cb6de..96cd6f1 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;apply=yes \
-           file://gpsdrive-ifdef-mapnik.patch;apply=yes \
-           file://gpsdrive-2.10pre4-openstreetmap-download.patch;apply=yes"
+           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 cc614aa..53fc07b 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;apply=yes"
+	   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 1edf042..5bb2821 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;apply=yes \
-	   file://gqview-rc-quotes.patch;apply=yes;striplevel=0 \
-	   file://gqview-motion-hint.patch;apply=yes;striplevel=0 \
-	   file://gqview-gimp.patch;apply=yes;striplevel=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 3f5e8d2..6fb64ef 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;apply=yes \
-           file://install-help.patch;apply=yes"
+           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 3f83650..be954a6 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;apply=yes"
+           file://uclibc-fix.patch"
 
 inherit autotools
 
diff --git a/recipes/grep/grep_2.5.bb b/recipes/grep/grep_2.5.bb
index 0f75913..92e5d9f 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;apply=yes"
+	   file://install.patch"
 
 inherit autotools
 
diff --git a/recipes/grip/grip_3.2.0.bb b/recipes/grip/grip_3.2.0.bb
index 02c02e3..11d6ce7 100644
--- a/recipes/grip/grip_3.2.0.bb
+++ b/recipes/grip/grip_3.2.0.bb
@@ -8,7 +8,7 @@ LICENSE="GPL"
 SRC_URI="${SOURCEFORGE_MIRROR}/grip/grip-${PV}.tar.gz \
          file://patch-src::discdb;apply=yes;striplevel=0 \
          file://patch-src::main.c;apply=yes;striplevel=0 \
-         file://no-host-includes.patch;apply=yes "
+         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 ce5e973..491bd8d 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;apply=yes "
+         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 b8b8e24..7e36d15 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;apply=yes"
+	           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 5ab5509..22afab2 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;apply=yes \
-	           file://Makefile.sub.patch;apply=yes \
-	           file://groff.patch;apply=yes"
+	           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 45b89a5..98691c1 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;apply=yes \
-           file://grub-0.97-disk_geometry-1.patch;apply=yes \
-           file://grub-support-256byte-inode.diff;apply=yes \
+           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 66ed31a..9aac182 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;apply=yes \
-           file://0002_svn_snapshot_jbig2dec.patch;apply=yes \
-           file://1001_install_cjk_examples.patch;apply=yes \
-           file://1002_ps2pdf_man_fix.patch;apply=yes \
-           file://1003_fix_autoconf_create_from_infiles.patch;apply=yes \
-           file://1004_CVE-2009-0792_CVE-2009-0584_CVE-2009-0583.patch;apply=yes \
-           file://1006_system-jasper.patch;apply=yes \
-           file://1007_fix_pphs_script_not_lib.patch;apply=yes \
-           file://2001_docdir_fix_for_debian.patch;apply=yes \
-           file://2002_gs_man_fix_debian.patch;apply=yes \
+           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 c63647c..c713211 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;apply=yes"
+           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 3f9fcf9..3441aa1 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;apply=yes"
+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 6fd05a0..b26cd1f 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;apply=yes \
+            file://fix_makefiles.patch \
            "
 
 SRC_URI[md5sum] = "b10893acb76c5d016c9bcfff6ba9418b"
diff --git a/recipes/gspcav1/gspcav1_20070110.bb b/recipes/gspcav1/gspcav1_20070110.bb
index 3aaea03..9222486 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;apply=yes \
-	   file://MS.patch;apply=yes"
+           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 7cdec5a..24325ca 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;apply=yes \
-	   file://MS.patch;apply=yes"
+           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 bc44903..643143e 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;apply=yes \
+           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 f187f54..098d5d8 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;apply=yes \
+           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 09ecf83..c835011 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;apply=yes \
-	   file://autotools.patch;apply=yes \
+	   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 973be9a..19d1bb1 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;apply=yes \
+           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 6d9d146..0a9b373 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;apply=yes \
-           file://lower-rank.diff;apply=yes \
+           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 cbc50ae..c9e33de 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;apply=yes \
-           file://lower-rank.diff;apply=yes \
+           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 42bd9d2..9ee8cd7 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;apply=yes \
+           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 96c2bcc..6b03e9f 100644
--- a/recipes/gstreamer/gst-omapfb_1.0.bb
+++ b/recipes/gstreamer/gst-omapfb_1.0.bb
@@ -9,7 +9,7 @@ SRCREV = "6f0b1cb50d1c67c3a3db2f11246256060ac871de"
 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;apply=yes"
+           file://0001-Implement-XOverlay-and-I420-to-422-colorspace-conver.patch"
 
 S  ="${WORKDIR}/git"
 
diff --git a/recipes/gstreamer/gst-plugin-bc_git.bb b/recipes/gstreamer/gst-plugin-bc_git.bb
index 9b42693..732ada0 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;apply=yes \
+           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 8f0cfdb..de4c9f6 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;apply=yes"
+	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 8d4ad0e..b798523 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;apply=yes"
+            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 05a8ad4..c357470 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;apply=yes"
+            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 9229510..45c3617 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;apply=yes;striplevel=2 \
-            file://ivorbis-thumb.patch;apply=yes"
+            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 4a8b425..e69002d 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;apply=yes;striplevel=2 \
-            file://ivorbis-thumb.patch;apply=yes"
+            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 2bfa187..05381e6 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;apply=yes \
-            file://gst-plugins-base_rowstride.patch;apply=yes \
+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 44fb97d..000761f 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;apply=yes \
-            file://ivorbis-thumb.patch;apply=yes \
+            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 e32bd2c..f2b0a5a 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;apply=yes"
+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 822dc0d..7875039 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;apply=yes \
+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 bfe10d3..0f6ff3f 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;apply=yes \
+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 0aec219..5c446e6 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;apply=yes \
+  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 8514934..e21abc9 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;apply=yes \
-  file://gstsid_autofoo_HACK.patch;apply=yes \
+  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 e8ebf8a..c82370b 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;apply=yes \
-  file://gstsid_autofoo_HACK.patch;apply=yes \
+  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 c9bba97..bc0a3b9 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;apply=yes \
-  file://gstsid_autofoo_HACK.patch;apply=yes \
+  file://gstmad_16bit.patch \
+  file://gstsid_autofoo_HACK.patch \
 "
 
 SRC_URI[archive.md5sum] = "0bc0d27bcce88c73ef6c81e88624e686"
diff --git a/recipes/gstreamer/gstreamer_0.10.17.bb b/recipes/gstreamer/gstreamer_0.10.17.bb
index 8e4a3c7..dd01e16 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;apply=yes \
-            file://registry-do-not-look-into-debug-dirs.patch;apply=yes "
+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 375d80e..079e3bd 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;apply=yes"
+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 6ad8328..86ae530 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;apply=yes"
+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 2df8d5b..8aa57e9 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;apply=yes \
+  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 9838338..0ec1508 100644
--- a/recipes/gtk+/gtk+-1.2_1.2.10.bb
+++ b/recipes/gtk+/gtk+-1.2_1.2.10.bb
@@ -7,7 +7,7 @@ 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;apply=yes \
+           file://timezone-fix.patch \
            file://gtk+1.2-reconf-fix;apply=yes \
            file://no-xwc;apply=yes"
 S = "${WORKDIR}/gtk+-${PV}"
diff --git a/recipes/gtk+/gtk+-fastscaling_2.10.14.bb b/recipes/gtk+/gtk+-fastscaling_2.10.14.bb
index 3a47970..d2b3347 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;apply=yes"
+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 3ad071b..bb74d78 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;apply=yes \
-	file://run-iconcache.patch;apply=yes \
-	file://toggle-font.diff;apply=yes;striplevel=0 \
-	file://xsettings.patch;apply=yes \
+	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 9c81f03..473de5a 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;apply=yes \
-           file://automake-lossage.patch;apply=yes \
-           file://disable-tooltips.patch;apply=yes \
+           file://no-xwc.patch \
+           file://automake-lossage.patch \
+           file://disable-tooltips.patch \
            file://gtklabel-resize-patch;apply=yes \
-           file://menu-deactivate.patch;apply=yes \
-           file://xsettings.patch;apply=yes \
-           file://scroll-timings.patch;apply=yes \
-           file://small-gtkfilesel.patch;apply=yes \
-           file://small-gtkfilechooser.patch;apply=yes \
-#           file://migration.patch;apply=yes;striplevel=0 \
-           file://run-iconcache.patch;apply=yes \
-           file://hardcoded_libtool.patch;apply=yes \
-           file://no-demos.patch;apply=yes \
-           file://single-click.patch;apply=yes \
-           file://spinbutton.patch;apply=yes \
-           file://gtk+-handhelds.patch;apply=yes \
-           file://filesel-fix-segfault.patch;apply=yes \
-           file://combo-arrow-size.patch;apply=yes;striplevel=0 \
-           file://range-no-redraw.patch;apply=yes;striplevel=0 \
-           file://scrolled-placement.patch;apply=yes;striplevel=0 \
-           file://treeview-checkbox-size.patch;apply=yes;striplevel=0 \
-           file://cell-renderer-edit-focus.patch;apply=yes;striplevel=0 \
+           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 9ea77f3..664ed7e 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;apply=yes \
-           file://cellrenderer-cairo.patch;apply=yes;striplevel=0 \
-           file://entry-cairo.patch;apply=yes;striplevel=0 \
-           file://scrolled-placement.patch;apply=yes;striplevel=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;apply=yes \
-#           file://menu-deactivate.patch;apply=yes \
-#           file://combo-arrow-size.patch;apply=yes;striplevel=0 \
+#           file://menu-deactivate.patch \
+#           file://combo-arrow-size.patch;striplevel=0 \
 # die die die
-#           file://pangoxft2.10.6.diff;apply=yes"
+#           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 7d4dd8b..bf5a41f 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;apply=yes;striplevel=0 \
-           file://entry-cairo.patch;apply=yes;striplevel=0 \
-           file://scrolled-placement.patch;apply=yes;striplevel=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;apply=yes \
-#           file://menu-deactivate.patch;apply=yes \
-#           file://combo-arrow-size.patch;apply=yes;striplevel=0 \
+#           file://menu-deactivate.patch \
+#           file://combo-arrow-size.patch;striplevel=0 \
 # die die die
-#           file://pangoxft2.10.6.diff;apply=yes"
+#           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 c22769f..53b0bb8 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;apply=yes;striplevel=0 \
-           file://entry-cairo.patch;apply=yes;striplevel=0 \
-           file://scrolled-placement.patch;apply=yes;striplevel=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;apply=yes \
-#           file://menu-deactivate.patch;apply=yes \
-#           file://combo-arrow-size.patch;apply=yes;striplevel=0 \
+#           file://menu-deactivate.patch \
+#           file://combo-arrow-size.patch;striplevel=0 \
 # die die die
-#           file://pangoxft2.10.6.diff;apply=yes"
+#           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 7886f9a..cb0d3f7 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;apply=yes \
+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 259b8ee..237689d 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;apply=yes \
+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 f6b31a8..68bf212 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;apply=yes \
+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 359705b..45eaf30 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;apply=yes \
-           file://no-demos.patch;apply=yes \
-           file://no-xwc.patch;apply=yes \
-           file://automake-lossage.patch;apply=yes \
-           file://gtk+-handhelds.patch;apply=yes \
-           file://spinbutton.patch;apply=yes \
-           file://hardcoded_libtool.patch;apply=yes \
-           file://disable-tooltips.patch;apply=yes \
+           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;apply=yes \
-           file://xsettings.patch;apply=yes \
-           file://scroll-timings.patch;apply=yes \
-           file://small-gtkfilesel.patch;apply=yes \
-           file://migration.patch;apply=yes;striplevel=0 \
-           file://single-click.patch;apply=yes \
-           file://menu-styling.patch;apply=yes \
-           file://compile-against-newer-glib.patch;apply=yes \
-           file://gtk.keynav.gtkcombobox.patch;apply=yes;striplevel=0 \
-           file://gtk.keynav.gtkentry.patch;apply=yes;striplevel=0 \
-           file://gtk.keynav.gtkiconview.patch;apply=yes;striplevel=0 \
-           file://gtk.keynav.gtkradiobutton.patch;apply=yes;striplevel=0 \
-           file://gtk.keynav.gtksettings.patch;apply=yes;striplevel=0 \
-           file://gtk.keynav.gtktextview.patch;apply=yes;striplevel=0 \
-           file://gtk.keynav.gtktreeview.patch;apply=yes;striplevel=0 \
-           file://gtk.keynav.gtkwidget.patch;apply=yes;striplevel=0 \
-           file://gtk+-2.6.10-bg.patch;apply=yes \
-           file://filesel-fix-segfault.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 c589764..f1141be 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;apply=yes \
-           file://automake-lossage.patch;apply=yes \
-	   file://spinbutton.patch;apply=yes \
-	   file://hardcoded_libtool.patch;apply=yes \
-	   file://disable-tooltips.patch;apply=yes \
+           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;apply=yes \
-	   file://menu-deactivate.patch;apply=yes \
-	   file://xsettings.patch;apply=yes \
-	   file://scroll-timings.patch;apply=yes \
-	   file://small-gtkfilesel.patch;apply=yes \
-	   file://migration.patch;apply=yes;striplevel=0 \
-	   file://no-demos.patch;apply=yes \
-	   file://gtk+-handhelds.patch;apply=yes \
-	   file://single-click.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 c2250ab..224702e 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;apply=yes \
-           file://automake-lossage.patch;apply=yes \
-	   file://spinbutton.patch;apply=yes \
-	   file://hardcoded_libtool.patch;apply=yes \
-	   file://disable-tooltips.patch;apply=yes \
+           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;apply=yes \
-	   file://xsettings.patch;apply=yes \
-	   file://scroll-timings.patch;apply=yes \
-	   file://small-gtkfilesel.patch;apply=yes \
-	   file://migration.patch;apply=yes;striplevel=0 \
-	   file://no-demos.patch;apply=yes \
-	   file://gtk+-handhelds.patch;apply=yes \
-	   file://single-click.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 10f9e3f..4c9fa1a 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;apply=yes"
+	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 279dbec..9abe977 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;apply=yes \
+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 46cb0da..58f1cd9 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;apply=yes \
+                       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 20482d3..f3a28fd 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;apply=yes"
+           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 b92444f..ac44373 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;apply=yes"
+           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 b7921b8..d7692ca 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;apply=yes"
+           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 dac39c0..180c149 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;apply=yes"
+           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 fbc6d34..924b40f 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;apply=yes \
-           file://libm.patch;apply=yes"
+           file://missing-includes.patch \
+           file://libm.patch"
 
-SRC_URI_append_sh3 = " file://superh-aclocal.patch;apply=yes \
-                       file://gcc4-fno-threadsafe-statics.patch;apply=yes \
-		       file://superh-ustring-declaration-error.patch;apply=yes"
+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 f88ea1f..bffeae4 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;apply=yes"
+           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 247e510..276d055 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;apply=yes"
+           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 8ee00b5..afa65bf 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;apply=yes \
-	   file://no-static-templates.patch;apply=yes \
+           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 5adfce6..085313a 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;apply=yes	\
-   	   file://gdk-colorspace.diff;apply=yes \
-	   file://fix-loading-error-report.patch;apply=yes"
+	   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 b9dc94d..e1b4695 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;apply=yes \
-           file://gcc4-fno-threadsafe-statics-NRCit.patch;apply=yes"
+           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 a003457..00aebce 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;apply=yes \
-           file://gcc4-fno-threadsafe-statics-NRCit.patch;apply=yes"
+           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 1b0be98..e332be4 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;apply=yes"
+           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 b91e8dc..41dd6c4 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;apply=yes \
-	   file://setHandle_segfault-fix.patch;apply=yes"
+	   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 f1fec4d..9c1ac02 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;apply=yes \
-	   file://KWQKURL-urlcmp.patch;apply=yes \
-           file://gcc4-fno-threadsafe-statics-NRCore.patch;apply=yes"
+           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 f924fcb..5f364e6 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;apply=yes \
-	   file://build_silence.patch;apply=yes;maxdate=20070401 \
-	   file://path_fixes.patch;apply=yes"
+           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 cb09f0b..9c03a50 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;apply=yes"
+	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 b317f25..c1af59d 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;apply=yes"
+	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 2d4d012..b533245 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;apply=yes"
+	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 89febc4..6bb85cd 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;apply=yes"
+           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 18122ff..d2b1760 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;apply=yes;striplevel=0;maxrev=1157;name=patch1 \
-	http://svn.o-hand.com/repos/web/trunk/patches/css-stylesheet-user.patch;apply=yes;striplevel=0;maxrev=1157;name=patch2 \
-	http://svn.o-hand.com/repos/web/trunk/patches/css-media.patch;apply=yes;striplevel=0;maxrev=1157;name=patch3 \
-	http://svn.o-hand.com/repos/web/trunk/patches/add-end-element-signal.patch;apply=yes;striplevel=0;maxrev=1157;name=patch4 \
-	http://svn.o-hand.com/repos/web/trunk/patches/add-dom-functions.patch;apply=yes;striplevel=0;maxrev=1157;name=patch5 \
-	http://svn.o-hand.com/repos/web/trunk/patches/iain-mem-leak.patch;apply=yes;striplevel=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 eca2276..2426980 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;apply=yes"
+           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 2105af8..01325ba 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;apply=yes \
-           file://cpp-linemarkers.patch;apply=yes \
+           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 8b43cbb..c4bc392 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;apply=yes \
-           file://cpp-linemarkers.patch;apply=yes \
+           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 d18ab49..aa4fbb0 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;apply=yes \
-           file://cpp-linemarkers.patch;apply=yes \
+           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 19c1564..95cdfaa 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;apply=yes \
+           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 95fbc54..493e067 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;apply=yes \
+           file://configure-fix.patch \
           "
 
 
diff --git a/recipes/guile/guile_1.8.7.bb b/recipes/guile/guile_1.8.7.bb
index 17aa38b..b5d49fc 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;apply=yes \
+           file://configure-fix.patch \
           "
 
 
diff --git a/recipes/gweled/gweled_0.5.bb b/recipes/gweled/gweled_0.5.bb
index ae1bbc7..3b63ce3 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;apply=yes"
+	   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 226485b..73c739b 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;apply=yes"
+	   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 b1a14a1..3e11065 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;apply=yes"
+	   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 f303257..9b112dd 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;apply=yes \
-           file://remove-werror.patch;apply=yes \
+           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 12dc0fd..a4dadea 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;apply=yes"
+	   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 613a066..315570b 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;apply=yes \
-             file://fix-configure.diff;apply=yes \
-             file://wifi-2.6.27.diff;apply=yes"
+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 f61ad02..36d5b3b 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;apply=yes \
+        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 5956053..ef4b044 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;apply=yes \
-           file://sg-inhibit.patch;apply=yes \
+           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 c79d7b4..64a0a7e 100644
--- a/recipes/hal/ohm_git.bb
+++ b/recipes/hal/ohm_git.bb
@@ -5,7 +5,7 @@ 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;apply=yes"
+           file://fix_configure.patch"
 
 SRCREV = "edfe25d49d67884bf004de7ae0724c162bb5e65e"
 PV = "0.1.2+${PR}+gitr${SRCREV}"
diff --git a/recipes/handsfree/handsfree_0.1.bb b/recipes/handsfree/handsfree_0.1.bb
index 10f83b3..85d8a13 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;apply=yes \
+  file://Makefile.patch \
 "
 S = "${WORKDIR}/handsfree"
 
diff --git a/recipes/havp/havp_0.82.bb b/recipes/havp/havp_0.82.bb
index 4d07355..9ec48e6 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;apply=yes"
+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 6ae2de7..0b4f16a 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;apply=yes"
+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 c0c21f8..f3e2811 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;apply=yes \
+	   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 cee4dfb..b6d3de6 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;apply=yes \
-	   file://uclibc.patch;apply=yes"
+	   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 281a06c..8cc9294 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;apply=yes \
-	   file://uclibc.patch;apply=yes"
+	   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 cf8a8ec..8bf7e1a 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;apply=yes \
-	   file://uclibc.patch;apply=yes"
+	   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 889e9c5..22e9cb8 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;apply=yes \
-	   file://hfsplusutils-1.0.4-gcc4.patch;apply=yes \
-	   file://hfsplusutils-1.0.4-glob.patch;apply=yes \
-	   file://hfsplusutils-1.0.4-string.patch;apply=yes \
+	   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 4d040b5..708ad84 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;apply=yes \
-	   file://largerthan2gb.patch;apply=yes \
+	   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 e39961a..c106d83 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;apply=yes"
+	file://makefile.patch"
 
 inherit pkgconfig binconfig
 
diff --git a/recipes/hostap/hostap-daemon.inc b/recipes/hostap/hostap-daemon.inc
index b98572e..33dc1c1 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;apply=yes;striplevel=0 \
-	file://madwifi-bsd-fix.diff;apply=yes;striplevel=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 34d5415..197e6cd 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;apply=yes"
+	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 dd27dfd..d5a71fc 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;apply=yes \
+	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 e3fe549..ba8761e 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;apply=yes \
+	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 5f5b87c..bed65fe 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;apply=yes \
-	   file://hostap-driver-0.4.7.patch;apply=yes \
+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;apply=yes;striplevel=0 \
-	file://mtx_hostap_deferred_irq.diff;apply=yes;striplevel=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 4a2afc5..40e6742 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;apply=yes;striplevel=0 \
-	file://mtx_hostap_deferred_irq.diff;apply=yes;striplevel=0"
-SRC_URI_append_mtx-2 = " file://mtx_compat.diff;apply=yes;striplevel=0 \
-	file://mtx_hostap_deferred_irq.diff;apply=yes;striplevel=0"
-SRC_URI_append_h3900 = " file://ipaq_compat.patch;apply=yes "
+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 1ba8887..e7cd26d 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;apply=yes"
+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 9042495..2254598 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;apply=yes"
+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 d960fce..fffa2a7 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;apply=yes \
-	   file://ldflags.patch;apply=yes"
+	   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 2ed367e..1b0185c 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;apply=yes"
+	   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 6e7609a..fa2eb34 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;apply=yes;striplevel=0 \
-	file://configure.patch;apply=yes;striplevel=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 3768620..4a7fe8b 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;apply=yes \
-	   file://hping2_configure.patch;apply=yes"
+	   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 33c5ff2..5215796 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;apply=yes"
+           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 3c63528..6b17bb0 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;apply=yes"
+           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 e80be26..2ef889b 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;apply=yes;striplevel=0 \
-	file://htb-basic-verbose.diff;apply=yes;striplevel=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 e69d5cf..2c702e6 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;apply=yes"
+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 850231e..098bf63 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;apply=yes"
+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 a07600b..36a6dee 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;apply=yes"
+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 7c5aa80..60d9360 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;apply=yes"
+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 8ba1137..bb5ce8b 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;apply=yes"
+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 eb1cfb6..aac761e 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;apply=yes"
+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 58dc218..4474bea 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;apply=yes"
+           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 fd02afc..cfa4147 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;apply=yes"
+	   file://install.patch"
 
 inherit autotools
 
diff --git a/recipes/hwdata/hwdata_0.191.bb b/recipes/hwdata/hwdata_0.191.bb
index 26a54c1..527efdf 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;apply=yes;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/read-edid_1.4.1.bb b/recipes/i2c-tools/read-edid_1.4.1.bb
index 971d2cd..b2c0216 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;apply=yes;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/ibrdtn_0.1.1.bb b/recipes/ibrdtn/ibrdtn_0.1.1.bb
index 10b4084..3e76e72 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;apply=yes \
+        file://0001-fix-header-include-for-gcc44.patch \
         "
 
 inherit autotools
diff --git a/recipes/icewm/icewm_1.2.30.bb b/recipes/icewm/icewm_1.2.30.bb
index 2eb9041..18af8e4 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;apply=yes \
-  file://configure.patch;apply=yes \
+  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 8776796..38b383d 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;apply=yes \
+    file://makefile.patch \
     "
 
 DEPENDS = "bluez-libs"
diff --git a/recipes/icu/icu-3.6.inc b/recipes/icu/icu-3.6.inc
index 16a1fd2..68d89a2 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;apply=yes"
+           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 4a07592..cbc426e 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;apply=yes \
-            file://rematch-gcc-bug.patch;apply=yes"
+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 dede25d..365495f 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;apply=yes;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 d0ae788..e60542c 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;apply=yes \
- file://nobash.patch;apply=yes"
+ 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 aa5f2f9..31e24d5 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;apply=yes \
-           file://zeroconf.patch;apply=yes \
+           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 62df0e9..6987920 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;apply=yes"
+           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 7e2001d..dcbdebe 100644
--- a/recipes/imagemagick/imagemagick_6.3.5-10.bb
+++ b/recipes/imagemagick/imagemagick_6.3.5-10.bb
@@ -6,10 +6,10 @@ PR = "r9"
 
 SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \
            file://PerlMagic_MakePatch;apply=yes \
-           file://makefile-am.patch;apply=yes \
-           file://binconfig-fixes.patch;apply=yes \
-           file://fix_open_file.patch;apply=yes \
-           file://openm4-autoconf-fix.patch;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/imlib/imlib_1.9.15.bb b/recipes/imlib/imlib_1.9.15.bb
index f41d266..ee624d0 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;apply=yes"
+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 0177b4d..fa38ade 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;apply=yes"
+	   file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/inkscape/inkscape_0.43.bb b/recipes/inkscape/inkscape_0.43.bb
index 12b0b53..7fdbf0f 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;apply=yes"
+           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 923d7ca..14837a8 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;apply=yes"
+           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 7683ea8..f61fb1b 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;apply=yes"
+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 b14b396..b139c1e 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;apply=yes \
+           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 a83a46a..313f3d9 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;apply=yes"
+           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 df69a52..6675686 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;apply=yes"
+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 6d84660..aa7a94d 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;apply=yes"
+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 bbd0312..ee1fa8c 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;apply=yes"
+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 bcc6c5b..6db0f23 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;apply=yes"
+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 a2ac6c9..d1561f3 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;apply=yes;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 7b2f017..9a5850a 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;apply=yes \
-	   file://202_fix-menus.diff;apply=yes \
-	   file://203_fix-kludges.diff;apply=yes \
-	   file://204_fix-bindings.diff;apply=yes \
-	   file://205_ion-lock.diff;apply=yes \
-	   file://206_use-xterm.diff;apply=yes \
-	   file://luaconfig.patch;apply=yes \
-	   file://cross.patch;apply=yes"
+	   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 1789090..a44096c 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;apply=yes"
+           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 63ca2ce..fa5ab6a 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;apply=yes"
-SRC_URI_append = " file://install-fix.patch;apply=yes"
-SRC_URI_append = " file://unbreak.patch;apply=yes"
+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 9148501..1e2cf99 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;apply=yes"
+          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 1dcfa3f..d1a1262 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;apply=yes"
+	file://socketaddr-h-errno.diff"
 
 inherit autotools
 
diff --git a/recipes/ipkg-utils/ipkg-link_1.6+cvs20050404.bb b/recipes/ipkg-utils/ipkg-link_1.6+cvs20050404.bb
index 6cd8af1..6687129 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;apply=yes"
+	   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 503208f..98b0cf7 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;apply=yes \
-           file://ipkg-py-sane-vercompare.patch;apply=yes \
-           file://ipkg-py-tarfile.patch;apply=yes \
-           file://arfile_even_alignment.patch;apply=yes \
-           file://ipkg-make-index-track-stamps.patch;apply=yes \
-           file://fields_tweaks.patch;apply=yes \
-           file://ipkg-env.patch;apply=yes \
+           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 5b57d71..21792df 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;apply=yes \
-           file://enable_debversion.patch;apply=yes \
-           file://is-processing.patch;apply=yes \
-           file://1-pkg-parse--Optimize-inefficient-parsing.patch;apply=yes \
-           file://2-pkg-vec--Optimize-gross-inefficiency.patch;apply=yes \
+           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 650c6a5..c28cf8b 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;apply=yes \
-        file://enable_debversion.patch;apply=yes \
+        file://update_version_comparision.patch \
+        file://enable_debversion.patch \
         file://ipkg-configure \
-	file://terse.patch;apply=yes"
+	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 41cbd57..8eb83a1 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;apply=yes \
-	file://is-processing.patch;apply=yes \
-	file://1-pkg-parse--Optimize-inefficient-parsing.patch;apply=yes \
-	file://2-pkg-vec--Optimize-gross-inefficiency.patch;apply=yes \
-	file://lonk-link-name.patch;apply=yes \
+	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 07b3b1a..ac3d831 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;apply=yes;striplevel=0 \
-            file://new-flex-fix.patch;apply=yes"
+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 99750b6..193cd00 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;apply=yes \
-                   file://ip6tunnel.patch;apply=yes \
-                   file://man-pages-fix.patch;apply=yes \
-                   file://remove-bashisms.patch;apply=yes \
-                   file://no-strip.patch;apply=yes"
+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 5c0236f..a0261c2 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;apply=yes \
-                   file://ip6tunnel.patch;apply=yes \
-                   file://remove-bashisms.patch;apply=yes \
-                   file://no-strip.patch;apply=yes"
+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 bf2ff49..4831710 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;apply=yes \
-	   file://compilation-fix.patch;apply=yes \
-	   file://use-cross-compiler.patch;apply=yes \
-	   file://remove-bashisms.patch;apply=yes \
+	   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 1801647..b952fa5 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;apply=yes \
+	   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 554f4a9..4a70543 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;apply=yes file://gcc-4.2.patch;patch=1"
+SRC_URI += "file://racoon-search-missing.patch file://gcc-4.2.patch;patch=1"
 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 d654a88..c85ed0a 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;apply=yes file://gcc-4.2.patch;patch=1"
+SRC_URI += "file://racoon-search-missing.patch file://gcc-4.2.patch;patch=1"
 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 a06d8f1..a24ab4f 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;apply=yes \
-  file://iptables-use-s6_addr32.patch;apply=yes \
-  file://cross-iptables.diff;apply=yes \
+  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 e6c8d33..fb1c79f 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;apply=yes \
+	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 ac02a1e..242ec13 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;apply=yes;name=patch \
-    file://support-makefile.patch;apply=yes \
+    ${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 91b6e8a..70a4c72 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;apply=yes"
+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 6101e2f..d094d4d 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;apply=yes \
-	    file://makefile.patch;apply=yes \
-	    file://standard-header-types.patch;apply=yes \
-	    file://tracepath6-mtu-opt.patch;apply=yes \
-	    file://remove-glibc-headers.patch;apply=yes \
-	    file://iputils-retvals.patch;apply=yes \
-	    file://glibc-2.4-compat.patch;apply=yes"
+	    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 56363f8..5809099 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;apply=yes \
-           file://debian/add-icmp-return-codes.diff;apply=yes \
-           file://debian/use_gethostbyname2.diff;apply=yes \
-           file://debian/fix-cmsghdr-offset-bug.diff;apply=yes \
-           file://debian/cleanup-docbook-formatting.diff;apply=yes \
-           file://debian/targets.diff;apply=yes \
-           file://debian/fix-tracepath-docs.diff;apply=yes \
-           file://debian/fix-arping-timeouts.diff;apply=yes \
+           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 36dec1c..95cf9ae 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;apply=yes \
-           file://qt2310-fontbug.patch;apply=yes"
+           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 045e4e7..f4a7aea 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;apply=yes"
+           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 f6ebca8..129029f 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;apply=yes \
-	   file://m4.patch;apply=yes"
+	   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 0136dd6..bb11cda 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;apply=yes \
-	   file://m4.patch;apply=yes \
-	   file://ldflags.patch;apply=yes \
-           file://sbindir.patch;apply=yes \
+	   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 61f0357..8f88ad7 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;apply=yes"
+	   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 a8a8d9e..e9c3dc1 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;apply=yes"
+           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 3dfd1d1..30f53c8 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;apply=yes"
+           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 22108c3..6bce68a 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;apply=yes;striplevel=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 298fa2a..6af6569 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;apply=yes"
+	   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 f5e1e45..1e12338 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;apply=yes \
-           file://2.6.29.patch;apply=yes \
+           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 dd85de8..ff38f15 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;apply=yes \
-           file://2.6.31.patch;apply=yes \
-           file://2.6.32.patch;apply=yes \
+           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 61b5f14..289d025 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;apply=yes \
+	   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 385f5f0..72ec23d 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;apply=yes \
-           file://ivman-launch.patch;apply=yes "
+           file://ivman-0.6-hotpluggable.patch \
+           file://ivman-launch.patch "
 
 inherit autotools
 
diff --git a/recipes/jaaa/clalsadrv_1.2.2.bb b/recipes/jaaa/clalsadrv_1.2.2.bb
index 60cae4b..5174dca 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;apply=yes \
+	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 da87770..4f7d244 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;apply=yes \
+	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 d29046c..9f2ed50 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;apply=yes \
+	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 786ab25..b729813 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;apply=yes \
+			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 f0c9f86..fb2f4bf 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;apply=yes \
+          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 a1c68da..3986861 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;apply=yes \
+          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-native_1.5.3.bb b/recipes/jamvm/jamvm-native_1.5.3.bb
index 754181e..10036ef 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;apply=yes"
+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 26ae4d5..0e96366 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;apply=yes"
+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 420ea61..2231566 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;apply=yes;striplevel=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 dd0ce7f..68949ab 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;apply=yes;striplevel=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
index 4569fd4..19eabfd 100644
--- a/recipes/jamvm/jamvm_1.5.3.bb
+++ b/recipes/jamvm/jamvm_1.5.3.bb
@@ -1,6 +1,6 @@
 require jamvm.inc
 
-SRC_URI += "file://debian-jni.patch;apply=yes;striplevel=0"
+SRC_URI += "file://debian-jni.patch;striplevel=0"
 
 PR = "r0"
 
diff --git a/recipes/javasqlite/javasqlite-mkconst-native_20080130.bb b/recipes/javasqlite/javasqlite-mkconst-native_20080130.bb
index 3db4d0e..c0a9b90 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;apply=yes"
+  file://build-fix.patch"
 
 S = "${WORKDIR}/javasqlite-${PV}"
 
diff --git a/recipes/javasqlite/javasqlite_20080130.bb b/recipes/javasqlite/javasqlite_20080130.bb
index c83c96c..e1b99d8 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;apply=yes"
+  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 cb1ee6a..c741ad4 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;apply=yes"
+           file://makefile.patch"
 
 S = "${WORKDIR}/jhead-2.6"
 
diff --git a/recipes/jpeg/jpeg_6b.bb b/recipes/jpeg/jpeg_6b.bb
index 5cd2b19..2158c6e 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;apply=yes \
-	   file://ldflags.patch;apply=yes \
-	   file://paths.patch;apply=yes \
-	   file://libtool_tweak.patch;apply=yes"
+	   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 f258b5e..5861724 100644
--- a/recipes/juce/juce_1.29.bb
+++ b/recipes/juce/juce_1.29.bb
@@ -8,8 +8,8 @@ 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;apply=yes \
-           file://no-opengl.patch;apply=yes"
+           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 eda8951..c6c24c4 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;apply=yes "
+           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 f6efe5a..9df89fa 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;apply=yes \
-file://missing-include.patch;apply=yes"
+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 84ae73c..d0997de 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;apply=yes"
+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 917c1e0..843f6fb 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;apply=yes"
+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 efca7bc..913d12c 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;apply=yes"
+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 4576fb7..c565cfc 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;apply=yes \
-file://kabc.patch;apply=yes \
-file://kammu.patch;apply=yes \
-file://korganizer.patch;apply=yes \
-file://nomail.patch;apply=yes \
+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 006c92c..126c3f1 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;apply=yes" 
+            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 c428cd6..ab9cb51 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;apply=yes"
+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 17e4cf7..65fb021 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;apply=yes \
-	    file://kexec-klibc.patch;apply=yes \
+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 440b342..bbd1753 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;apply=yes \
-	    file://kexec-tools-2-klibc.patch;apply=yes \
+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 434be71..0ff1c31 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;apply=yes \
-           file://kexec-arm-atags.patch;apply=yes"
+           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 1463b9a..a007cc2 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;apply=yes \
-           file://no-getline-no-fscanf.patch;apply=yes \
-           file://kexec-tools-2-arm-add-uImage.patch;apply=yes \
-           file://kexec-tools-2-autoconf-post-2.63.patch;apply=yes \
+           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/linux-kexecboot_2.6.21-hh20.bb b/recipes/kexecboot/linux-kexecboot_2.6.21-hh20.bb
index a3d3a5c..619f771 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;apply=yes \
-           http://www.rpsys.net/openzaurus/patches/archive/export_atags-r0a.patch;apply=yes;name=rppatch35 \
-           file://gcc4x-limits.patch;apply=yes \
+           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;apply=yes;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 b9bc160..55f0b7d 100644
--- a/recipes/kexecboot/linux-kexecboot_2.6.24.bb
+++ b/recipes/kexecboot/linux-kexecboot_2.6.24.bb
@@ -24,172 +24,172 @@ DEFAULT_PREFERENCE_spitz = "1"
 # 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;apply=yes \
-           ${RPSRC}/export_atags-r2.patch;apply=yes;status=pending;name=rppatch54 \
-           ${RPSRC}/lzo_crypto-r2.patch;apply=yes;status=pending;name=rppatch36 \
-           ${RPSRC}/corgi_rearrange_lcd-r0.patch;apply=yes;status=pending;name=rppatch55 \
-	   file://hrw-hostapcard.patch;apply=yes;status=pending \
-           ${RPSRC}/allow_disable_deferrred-r0.patch;apply=yes;name=rppatch56 \
-           ${RPSRC}/lzo_jffs2_sysfs-r1.patch;apply=yes;name=rppatch1 \
-           ${RPSRC}/hx2750_base-r33.patch;apply=yes;name=rppatch57 \
-           ${RPSRC}/hx2750_bl-r9.patch;apply=yes;name=rppatch3 \
-           ${RPSRC}/hx2750_pcmcia-r3.patch;apply=yes;name=rppatch4 \
-           ${RPSRC}/pxa_keys-r8.patch;apply=yes;name=rppatch58 \
-           ${RPSRC}/tsc2101-r18.patch;apply=yes;name=rppatch59 \
-           ${RPSRC}/hx2750_test1-r8.patch;apply=yes;name=rppatch7 \
-           ${RPSRC}/input_power-r10.patch;apply=yes;name=rppatch60 \
-           ${RPSRC}/pxa25x_cpufreq-r2.patch;apply=yes;name=rppatch44 \
-           ${RPSRC}/sharpsl_pm_fixes1-r0.patch;apply=yes;name=rppatch8 \
-           ${RPSRC}/pm_changes-r1.patch;apply=yes;name=rppatch9 \
-           ${RPSRC}/usb_add_epalloc-r4.patch;apply=yes;name=rppatch61 \
-           ${RPSRC}/usb_pxa27x_udc-r8.patch;apply=yes;name=rppatch62 \
-           ${RPSRC}/locomo_kbd_tweak-r1a.patch;apply=yes;name=rppatch63 \
-           ${RPSRC}/pxa27x_overlay-r8.patch;apply=yes;name=rppatch11 \
-           ${RPSRC}/w100_extaccel-r2.patch;apply=yes;name=rppatch12 \
-           ${RPSRC}/w100_extmem-r1.patch;apply=yes;name=rppatch13 \
-           ${RPSRC}/poodle_pm-r5.patch;apply=yes;name=rppatch64 \
-           ${RPSRC}/poodle_lcd_hack-r0.patch;apply=yes;name=rppatch15 \
-           ${RPSRC}/poodle_asoc_fix-r1.patch;apply=yes;name=rppatch16 \
-           file://pxa27x-resume.patch;apply=yes;status=external \
-           file://mtd-module.patch;apply=yes;status=external \
-           file://wm8750-treble.patch;apply=yes;status=external \
-           file://spitz_h_rewrite.patch;apply=yes;status=external \
-           file://pxa2xx_udc-clock.patch;apply=yes \
-           file://sharpsl-rc-r1.patch;apply=yes \
-           file://sharpsl-rc-r2.patch;apply=yes \
-           file://squashfs3.3.patch;apply=yes;status=external \
-#           ${RPSRC}/logo_oh-r1.patch.bz2;apply=yes;status=unmergable;name=rppatch17 \
-           ${RPSRC}/pxa-linking-bug.patch;apply=yes;status=unmergable;name=rppatch18 \
-           file://hostap-monitor-mode.patch;apply=yes;status=unmergable \
-           file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;apply=yes;status=unmergable \
-           ${RPSRC}/mmcsd_large_cards-r1.patch;apply=yes;status=hack;name=rppatch19 \
-           ${RPSRC}/mmcsd_no_scr_check-r2.patch;apply=yes;status=hack;name=rppatch20 \
-           ${RPSRC}/integrator_rgb-r1.patch;apply=yes;status=hack;name=rppatch21 \
-           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;apply=yes;status=hack;name=rppatch22 \
-           file://pxa-serial-hack.patch;apply=yes;status=hack \
-           file://connectplus-remove-ide-HACK.patch;apply=yes;status=hack \
-           file://connectplus-prevent-oops-HACK.patch;apply=yes;status=hack \
-           file://binutils-buildid-arm.patch;apply=yes \
-           file://versatile-armv6.patch;apply=yes \
-           file://htcuni.patch;apply=yes \
+	   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;apply=yes;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;apply=yes;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;apply=yes;name=rppatch52 \
+#            ${RPSRC}/usb_rndis_tweaks-r0.patch;name=rppatch52 \
 
 
 SRC_URI_append_collie = "\
-	${TKSRC}/mtd-sharp-flash-hack-r4.patch;apply=yes;name=tkpatch1 \
-	${TKSRC}/mcp-sa11x0-r0.patch;apply=yes;name=tkpatch2 \
-	${TKSRC}/locomo-r1.patch;apply=yes;name=tkpatch3 \
-	${TKSRC}/collie-kexec-r1.patch;apply=yes;name=tkpatch4 \
-	${TKSRC}/sharpsl_pm-4.patch;apply=yes;name=tkpatch5 \
-	${TKSRC}/collie_pm-3.patch;apply=yes;name=tkpatch6 \
-	${TKSRC}/ucb1x00_suspend.patch;apply=yes;name=tkpatch7 \
-	${TKSRC}/collie-ts.patch;apply=yes;name=tkpatch8 \
-	${TKSRC}/pcmcia_suspend.patch;apply=yes;name=tkpatch9 \
-	${TKSRC}/locomo_spi-6.patch;apply=yes;name=tkpatch10 \
-	${TKSRC}/config.patch;apply=yes;name=tkpatch11 \
-	${TKSRC}/mmc-spi.patch;apply=yes;name=tkpatch12 \
-	${TKSRC}/linux-2.6.24-SIMpad-rtc-sa1100.patch;apply=yes;name=tkpatch13 \
-	${TKSRC}/sa1100_spinlock.patch;apply=yes;name=tkpatch14 \
-	${TKSRC}/sa1100-dma.patch;apply=yes;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;apply=yes;name=rppatch53 \
-           file://poodle_ts.patch;apply=yes \
-           file://pxafb.patch;apply=yes \
+           ${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;apply=yes \
-           file://tosa/0002-Modify-dma_alloc_coherent-on-ARM-so-that-it-supports.patch;apply=yes \
-           file://tosa/0003-Core-MFD-support.patch;apply=yes \
-           file://tosa/0004-Add-support-for-tc6393xb-MFD-core.patch;apply=yes \
-           file://tosa/0005-Add-support-for-tc6387xb-MFD-core.patch;apply=yes \
-           file://tosa/0006-Add-support-for-t7l66xb-MFD-core.patch;apply=yes \
-           file://tosa/0007-Common-headers-for-TMIO-MFD-subdevices.patch;apply=yes \
-           file://tosa/0008-Nand-driver-for-TMIO-devices.patch;apply=yes \
-           file://tosa/0009-FB-driver-for-TMIO-devices.patch;apply=yes \
-           file://tosa/0010-OHCI-driver-for-TMIO-devices.patch;apply=yes \
-           file://tosa/0011-MMC-driver-for-TMIO-devices.patch;apply=yes \
-           file://tosa/0012-Tosa-keyboard-support.patch;apply=yes \
-           file://tosa/0013-USB-gadget-pxa2xx_udc-supports-inverted-vbus.patch;apply=yes \
-           file://tosa/0014-tosa_udc_use_gpio_vbus.patch.patch;apply=yes \
-           file://tosa/0015-sharpsl-export-params.patch;apply=yes \
-           file://tosa/0016-This-patch-fixes-the-pxa25x-clocks-definitions-to-ad.patch;apply=yes \
-           file://tosa/0026-I-don-t-think-we-should-check-for-IRQs-when-determin.patch;apply=yes \
-           file://tosa/0027-Add-LiMn-one-of-the-most-common-for-small-non-recha.patch;apply=yes \
-           file://tosa/0028-Add-suspend-resume-wakeup-support-for-pda_power.patch;apply=yes \
-           file://tosa/0029-Support-using-VOLTAGE_-properties-for-apm-calculati.patch;apply=yes \
-           file://tosa/0030-Core-driver-for-WM97xx-touchscreens.patch;apply=yes \
-           file://tosa/0031-Add-chip-driver-for-WM9705-touchscreen.patch;apply=yes \
-           file://tosa/0032-Add-chip-driver-for-WM9712-touchscreen.patch;apply=yes \
-           file://tosa/0033-Add-chip-driver-for-WM9713-touchscreen.patch;apply=yes \
-           file://tosa/0034-Driver-for-WM97xx-touchscreens-in-streaming-mode-on.patch;apply=yes \
-           file://tosa/0035-Build-system-and-MAINTAINERS-entry-for-WM97xx-touchs.patch;apply=yes \
-           file://tosa/0036-Set-id-to-1-for-wm97xx-subdevices.patch;apply=yes \
-           file://tosa/0037-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch;apply=yes \
-           file://tosa/0038-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch;apply=yes \
-           file://tosa/0044-fix-tmio_mmc-debug-compilation.patch;apply=yes \
-           file://tosa/0045-Update-tmio_ohci.patch;apply=yes \
-           file://tosa/0046-patch-tc6393xb-cleanup.patch;apply=yes \
-           file://tosa/0047-tc6393xb-use-bitmasks-instead-of-bit-field-structs.patch;apply=yes \
-           file://tosa/0048-tc6393xb-GPIO-support.patch;apply=yes \
-           file://tosa/0049-platform-support-for-TMIO-on-tosa.patch;apply=yes \
-           file://tosa/0050-tosa-update-for-tc6393xb-gpio.patch;apply=yes \
-           file://tosa/0051-fix-sound-soc-pxa-tosa.c-to-new-gpio-api.patch;apply=yes \
-           file://tosa/0052-tosa-platform-backlight-support.patch;apply=yes \
-           file://tosa/0053-sound-soc-codecs-wm9712.c-28.patch;apply=yes \
-           file://tosa/0054-sound-soc-codecs-wm9712.c-2.patch;apply=yes \
-           file://tosa/0055-Add-GPIO_POWERON-to-the-list-of-devices-that-we-supp.patch;apply=yes \
-           file://tosa/0058-Fix-tosakbd-suspend.patch;apply=yes \
-           file://tosa/0059-patch-tosa-wakeup-test.patch;apply=yes \
-           file://tosa/0060-Add-support-for-power_supply-on-tosa.patch;apply=yes \
-           file://tosa/0061-tosa-bat-unify.patch;apply=yes \
-           file://tosa/0062-tosa-bat-fix-charging.patch;apply=yes \
-           file://tosa/0063-patch-tosa-bat-jacket-detect.patch;apply=yes \
-           file://tosa/0064-Export-modes-via-sysfs.patch;apply=yes \
-           file://tosa/0065-wm97xx-core-fixes.patch;apply=yes \
-           file://tosa/0066-tmiofb_probe-should-be-__devinit.patch;apply=yes \
-           file://tosa/0067-modeswitching.patch;apply=yes \
-           file://tosa/0068-Preliminary-tosa-denoiser.patch;apply=yes \
-           file://tosa/0019-pxa-remove-periodic-mode-emulation-support.patch;apply=yes \
-           file://tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch;apply=yes \
-           file://tosa/0021-Add-an-empty-drivers-gpio-directory-for-gpiolib-infr.patch;apply=yes \
-           file://tosa/0022-Provide-new-implementation-infrastructure-that-platf.patch;apply=yes \
-           file://tosa/0023-This-adds-gpiolib-support-for-the-PXA-architecture.patch;apply=yes \
-           file://tosa/0024-Update-Documentation-gpio.txt-primarily-to-include.patch;apply=yes \
-           file://tosa/0025-Signed-off-by-Dmitry-Baryshkov-dbaryshkov-gmail.co.patch;apply=yes \
-           file://tosa/0039-Add-generic-framework-for-managing-clocks.patch;apply=yes \
-           file://tosa/0040-Clocklib-debugfs-support.patch;apply=yes \
-           file://tosa/0041-From-80a359e60c2aec59ccf4fca0a7fd20495f82b1d2-Mon-Se.patch;apply=yes \
-           file://tosa/0042-Use-correct-clock-for-IrDA-on-pxa.patch;apply=yes \
-           file://tosa/0043-Use-clocklib-for-sa1100-sub-arch.patch;apply=yes \
-           file://tosa/0056-Support-resetting-by-asserting-GPIO-pin.patch;apply=yes \
-           file://tosa/0057-Clean-up-tosa-resetting.patch;apply=yes \
-           file://tosa/0001-pxa2xx-ac97-switch-AC-unit-to-correct-state-before.patch;apply=yes \
-	   file://tosa/tosa-bl-fixup.diff;apply=yes \
-           file://tosa/tmiofb-fix-unaccel.patch;apply=yes \
+           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;apply=yes \
-#           file://tosa/0018-Fix-the-pxa2xx_udc-to-balance-calls-to-clk_enable-cl.patch;apply=yes \
+#           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;apply=yes;status=external \
+	file://htcuni-acx.patch;status=external \
 	"
 
 SRC_URI_append_zylonite ="\
-	file://pxa_fb_overlay.patch;apply=yes \
-	file://zylonite-boot.patch;apply=yes \
+	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 6b85368..cdc3f56 100644
--- a/recipes/kexecboot/linux-kexecboot_2.6.26.bb
+++ b/recipes/kexecboot/linux-kexecboot_2.6.26.bb
@@ -23,66 +23,66 @@ DEFAULT_PREFERENCE_akita = "1"
 # 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;apply=yes;name=rppatch1 \
-           ${RPSRC}/hx2750_base-r34.patch;apply=yes;name=rppatch2 \
-           ${RPSRC}/hx2750_bl-r9.patch;apply=yes;name=rppatch3 \
-           ${RPSRC}/hx2750_pcmcia-r3.patch;apply=yes;name=rppatch4 \
-           ${RPSRC}/pxa_keys-r9.patch;apply=yes;name=rppatch5 \
-           ${RPSRC}/tsc2101-r19.patch;apply=yes;name=rppatch6 \
-           ${RPSRC}/hx2750_test1-r8.patch;apply=yes;name=rppatch7 \
-           ${RPSRC}/sharpsl_pm_fixes1-r0.patch;apply=yes;name=rppatch8 \
-           ${RPSRC}/pm_changes-r1.patch;apply=yes;name=rppatch9 \
-           ${RPSRC}/locomo_kbd_tweak-r2.patch;apply=yes;name=rppatch10 \
-#           ${RPSRC}/pxa27x_overlay-r8.patch;apply=yes;name=rppatch11 \
-           ${RPSRC}/w100_extaccel-r2.patch;apply=yes;name=rppatch12 \
-           ${RPSRC}/w100_extmem-r1.patch;apply=yes;name=rppatch13 \
-           ${RPSRC}/poodle_pm-r6.patch;apply=yes;name=rppatch14 \
-           ${RPSRC}/poodle_lcd_hack-r0.patch;apply=yes;name=rppatch15 \
-           ${RPSRC}/poodle_asoc_fix-r1.patch;apply=yes;name=rppatch16 \
-           file://zaurus-i2c-init.patch;apply=yes;status=upstream \
-#           ${RPSRC}/logo_oh-r1.patch.bz2;apply=yes;status=unmergable;name=rppatch17 \
-           ${RPSRC}/pxa-linking-bug.patch;apply=yes;status=unmergable;name=rppatch18 \
-           file://hostap-monitor-mode.patch;apply=yes;status=unmergable \
-           file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;apply=yes;status=unmergable \
-           ${RPSRC}/mmcsd_large_cards-r1.patch;apply=yes;status=hack;name=rppatch19 \
-           ${RPSRC}/mmcsd_no_scr_check-r2.patch;apply=yes;status=hack;name=rppatch20 \
-           ${RPSRC}/integrator_rgb-r1.patch;apply=yes;status=hack;name=rppatch21 \
-           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;apply=yes;status=hack;name=rppatch22 \
-           file://sharpsl-rc-r1.patch;apply=yes \
-           file://spitz_h_rewrite.patch;apply=yes \
-           file://pxa-serial-hack.patch;apply=yes;status=hack \
-           file://connectplus-remove-ide-HACK.patch;apply=yes;status=hack \
-           file://connectplus-prevent-oops-HACK.patch;apply=yes;status=hack \
-           file://htcuni.patch;apply=yes \
-           file://versatile-armv6.patch;apply=yes \
+           ${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;apply=yes;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;apply=yes;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;apply=yes;name=rppatch52 \
+#            ${RPSRC}/usb_rndis_tweaks-r0.patch;name=rppatch52 \
 
 
 SRC_URI_append_collie = "\
-	file://collie.patch;apply=yes \
-	file://collie_keymap.patch;apply=yes \
+	file://collie.patch \
+	file://collie_keymap.patch \
 "
 
 SRC_URI_append_htcuniversal ="\
-	file://htcuni-acx.patch;apply=yes;status=external \
+	file://htcuni-acx.patch;status=external \
 	"
 
 SRC_URI_append_zylonite ="\
-	file://pxa_fb_overlay.patch;apply=yes \
-	file://zylonite-boot.patch;apply=yes \
-	file://zylonite_mtd-r0.patch;apply=yes \
-	file://zylonite_touch-r0.patch;apply=yes \
-	file://zylonite_keypad-r0.patch;apply=yes \
+	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 304c84e..6624317 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;apply=yes \
-           file://no-cortex-deadlock.patch;apply=yes \
-           file://read_die_ids.patch;apply=yes \
-           file://fix-install.patch;apply=yes \
-           file://dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch;apply=yes \
-           file://dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch;apply=yes \
-           file://dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch;apply=yes \
-           file://dss2/0004-DSS2-OMAP-framebuffer-driver.patch;apply=yes \
-           file://dss2/0005-DSS2-Add-panel-drivers.patch;apply=yes \
-           file://dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch;apply=yes \
-           file://dss2/0007-DSS2-Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch;apply=yes \
-           file://dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch;apply=yes \
-           file://dss2/0009-DSS2-Add-acx565akm-panel.patch;apply=yes \
-           file://dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch;apply=yes \
-           file://dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch;apply=yes \
-           file://dss2/0012-DSS2-Fix-DMA-rotation.patch;apply=yes \
-           file://dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch;apply=yes \
-           file://dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch;apply=yes \
-           file://dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch;apply=yes \
-           file://dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch;apply=yes \
-           file://dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch;apply=yes \
-           file://dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch;apply=yes \
-           file://dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch;apply=yes \
-           file://dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch;apply=yes \
-           file://dss2/0021-DSS2-Add-venc-register-dump.patch;apply=yes \
-           file://dss2/0022-DSS2-FB-remove-unused-var-warning.patch;apply=yes \
-           file://dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch;apply=yes \
-           file://dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch;apply=yes \
-           file://dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch;apply=yes \
-           file://dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch;apply=yes \
-           file://dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch;apply=yes \
-           file://dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch;apply=yes \
-           file://dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch;apply=yes \
-           file://dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch;apply=yes \
-           file://dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch;apply=yes \
-           file://dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch;apply=yes \
-           file://dss2/0033-DSS2-Prefer-3-tap-filter.patch;apply=yes \
-           file://dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch;apply=yes \
-           file://dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch;apply=yes \
-           file://dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch;apply=yes \
-           file://dss2/0037-DSS2-Added-support-for-querying-color-keying.patch;apply=yes \
-           file://dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch;apply=yes \
-           file://dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch;apply=yes \
-           file://dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch;apply=yes \
-           file://dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch;apply=yes \
-           file://dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch;apply=yes \
-           file://dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch;apply=yes \
-           file://dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch;apply=yes \
-           file://dss2/0045-DSS2-Fixed-line-endings-from-to.patch;apply=yes \
-           file://dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch;apply=yes \
-           file://dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch;apply=yes \
-           file://dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch;apply=yes \
-           file://dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch;apply=yes \
-           file://dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch;apply=yes \
-           file://dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch;apply=yes \
-           file://dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch;apply=yes \
-           file://dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch;apply=yes \
-           file://dss2/0054-DSS2-DSI-more-error-handling.patch;apply=yes \
-           file://dss2/0055-DSS2-Added-global-alpha-support.patch;apply=yes \
-           file://dss2/0056-DSS2-Rotation-attrs-for-YUV-need-not-to-be-reversed.patch;apply=yes \
-           file://dss2/0057-DSS2-Documentation-update-for-new-sysfs-entries-in.patch;apply=yes \
-           file://dss2/0058-DSS2-Don-t-touch-plane-coordinates-when-changing-fb.patch;apply=yes \
-           file://dss2/0059-DSS2-DSI-configure-ENTER-EXIT_HS_MODE_LATENCY.patch;apply=yes \
-           file://dss2/0060-DSS2-Avoid-div-by-zero-when-calculating-required-fc.patch;apply=yes \
-           file://dss2/0061-DSS2-VRFB-save-restore-context.patch;apply=yes \
-           file://dss2/0062-DSS2-VRAM-Fix-indentation.patch;apply=yes \
-           file://dss2/0063-DSS2-fix-the-usage-of-get_last_off_on_transaction_i.patch;apply=yes \
-           file://dss2/0064-VRFB-fix-debug-messages.patch;apply=yes \
-           file://dss2/0065-VRFB-add-suspend-resume-functionality.patch;apply=yes \
-           file://dss2/0066-DSS2-DSI-tune-the-timings-to-be-more-relaxed.patch;apply=yes \
-           file://dss2/0067-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch;apply=yes \
-           file://dss2/0068-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch;apply=yes \
-           file://dss2/0069-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch;apply=yes \
-           file://dss2/0070-DSS2-fix-irq1.diff;apply=yes \
-           file://dss2/0071-DSS2-fix-irq2.diff;apply=yes \
-           file://0001-board-ldp-add-regulator-info-to-get-the-microSD-slo.patch;apply=yes \
-           file://fix-unaligned-access.diff;apply=yes \
-           file://make-alignment-visible.diff;apply=yes \
-           file://mmctiming.patch;apply=yes \
-           file://ehci.patch;apply=yes \
-           file://fix-audio-capture.patch;apply=yes \
-           file://ads7846-detection.patch;apply=yes \
-           file://musb/0001-USB-musb-only-turn-off-vbus-in-OTG-hosts.patch;apply=yes \
-           file://musb/0002-USB-composite-avoid-inconsistent-lock-state.patch;apply=yes \
-           file://musb/0003-USB-musb-NAK-timeout-scheme-on-bulk-RX-endpoint.patch;apply=yes \
-           file://musb/0004-USB-musb-rewrite-host-periodic-endpoint-allocation.patch;apply=yes \
-           file://musb/0005-USB-TWL-disable-VUSB-regulators-when-cable-unplugg.patch;apply=yes \
-           file://musb/0006-USB-gadget-composite-device-level-suspend-resume-h.patch;apply=yes \
-           file://musb/0007-usb-gadget-fix-ethernet-link-reports-to-ethtool.patch;apply=yes \
-           file://musb/0008-usb-musb_host-minor-enqueue-locking-fix-v2.patch;apply=yes \
-           file://musb/0009-usb-musb_host-fix-ep0-fifo-flushing.patch;apply=yes \
-           file://musb/0010-musb-sanitize-clearing-TXCSR-DMA-bits-take-2.patch;apply=yes \
-           file://musb/0011-musb-fix-isochronous-TXDMA-take-2.patch;apply=yes \
-           file://musb/0012-musb-fix-possible-panic-while-resuming.patch;apply=yes \
-           file://musb/0013-musb_host-refactor-musb_save_toggle-take-2.patch;apply=yes \
-           file://musb/0014-musb_gadget-suppress-parasitic-TX-interrupts-with.patch;apply=yes \
-           file://musb/0015-musb_gadget-fix-unhandled-endpoint-0-IRQs.patch;apply=yes \
-           file://musb/0016-musb_host-factor-out-musb_ep_-get-set-_qh.patch;apply=yes \
-           file://musb/0017-musb_host-refactor-URB-giveback.patch;apply=yes \
-           file://musb/0018-musb-split-out-CPPI-interrupt-handler.patch;apply=yes \
-           file://musb/0019-musb_host-simplify-check-for-active-URB.patch;apply=yes \
-           file://musb/0020-musb_host-streamline-musb_cleanup_urb-calls.patch;apply=yes \
-           file://musb/0021-twl4030-usb-fix-minor-reporting-goofage.patch;apply=yes \
-           file://musb/0022-musb-use-dma-mode-1-for-TX-if-transfer-size-equals.patch;apply=yes \
-           file://musb/0023-musb-add-high-bandwidth-ISO-support.patch;apply=yes \
-           file://musb/0024-USB-otg-adding-nop-usb-transceiver.patch;apply=yes \
-           file://musb/0025-nop-usb-xceiv-behave-when-linked-as-a-module.patch;apply=yes \
-           file://musb/0026-musb-proper-hookup-to-transceiver-drivers.patch;apply=yes \
-           file://musb/0027-musb-otg-timer-cleanup.patch;apply=yes \
-           file://musb/0028-musb-make-initial-HNP-roleswitch-work-v2.patch;apply=yes \
-           file://musb/0029-musb-support-disconnect-after-HNP-roleswitch.patch;apply=yes \
-           file://isp/v4l/0001-V4L2-Add-COLORFX-user-control.patch;apply=yes \
-           file://isp/v4l/0002-V4L-Int-if-v4l2_int_device_try_attach_all-requires.patch;apply=yes \
-           file://isp/v4l/0003-V4L-Int-if-Dummy-slave.patch;apply=yes \
-           file://isp/v4l/0004-V4L-int-device-add-support-for-VIDIOC_QUERYMENU.patch;apply=yes \
-           file://isp/v4l/0005-V4L-Int-if-Add-vidioc_int_querycap.patch;apply=yes \
-           file://isp/iommu/0001-omap-iommu-tlb-and-pagetable-primitives.patch;apply=yes \
-           file://isp/iommu/0002-omap-iommu-omap2-architecture-specific-functions.patch;apply=yes \
-           file://isp/iommu/0003-omap-iommu-omap3-iommu-device-registration.patch;apply=yes \
-           file://isp/iommu/0004-omap-iommu-simple-virtual-address-space-management.patch;apply=yes \
-           file://isp/iommu/0005-omap-iommu-entries-for-Kconfig-and-Makefile.patch;apply=yes \
-           file://isp/iommu/0006-omap-iommu-Don-t-try-BUG_ON-in_interrupt.patch;apply=yes \
-           file://isp/iommu/0007-omap-iommu-We-support-chained-scatterlists-probabl.patch;apply=yes \
-           file://isp/iommu/0008-omap2-iommu-entries-for-Kconfig-and-Makefile.patch;apply=yes \
-           file://isp/omap3camera/0001-omap3isp-Add-ISP-main-driver-and-register-definitio.patch;apply=yes \
-           file://isp/omap3camera/0002-omap3isp-Add-ISP-MMU-wrapper.patch;apply=yes \
-           file://isp/omap3camera/0003-omap3isp-Add-userspace-header.patch;apply=yes \
-           file://isp/omap3camera/0004-omap3isp-Add-ISP-frontend-CCDC.patch;apply=yes \
-           file://isp/omap3camera/0005-omap3isp-Add-ISP-backend-PRV-and-RSZ.patch;apply=yes \
-           file://isp/omap3camera/0006-omap3isp-Add-statistics-collection-modules-H3A-and.patch;apply=yes \
-           file://isp/omap3camera/0007-omap3isp-Add-CSI2-interface-support.patch;apply=yes \
-           file://isp/omap3camera/0008-omap3isp-Add-ISP-tables.patch;apply=yes \
-           file://isp/omap3camera/0009-omap34xxcam-Add-camera-driver.patch;apply=yes \
-           file://isp/resizer/0023-OMAP-Resizer-Basic-Resizer-refreshed-with-latest-gi.patch;apply=yes \
-           file://isp/resizer/0024-OMAP3-Resizer-V4L2-buf-layer-issues-fixed.patch;apply=yes \
-           file://isp/resizer/0025-OMAP3-Resizer-Build-issues-fixed.patch;apply=yes \
-           file://0124-leds-gpio-broken-with-current-git.patch;apply=yes \
-           file://modedb-hd720.patch;apply=yes \
-           file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;apply=yes \
-           file://vfp/02-vfp-ptrace.patch;apply=yes \
-           file://vfp/03-vfp-corruption.patch;apply=yes \
-           file://vfp/04-vfp-threads.patch;apply=yes \
-           file://vfp/05-vfp-signal-handlers.patch;apply=yes \
+           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;apply=yes \
-                               file://tincantools-puppy.diff;apply=yes \
+			                   file://beagle-asoc.patch \
+                               file://tincantools-puppy.diff \
 "
 
 SRC_URI_append_omap3evm = " \
-	file://evm-mcspi-ts.diff;apply=yes \
+	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 759fa9a..22e9580 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;apply=yes;status=pending \
-           file://v3-2-4-Add-support-for-LZO-compressed-kernels-for-ARM.patch;apply=yes;status=pending \
-           file://v3-3-4-Add-support-for-LZO-compressed-kernels-on-x86.patch;apply=yes;status=pending \
-           file://v3-4-4-Add-LZO-compression-support-for-initramfs-and-old-style-initrd.patch;apply=yes;status=pending \
-           file://ARM-Add-support-for-LZMA-compressed-kernel-images.patch;apply=yes;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;apply=yes \
-file://cm-t35/0001-omap3-cm-t35-add-mux-initialization.patch;apply=yes \
-file://cm-t35/0001-OMAP-DSS2-add-Toppoly-TDO35S-panel.patch;apply=yes \
-file://cm-t35/0002-omap3-cm-t35-add-DSS2-display-support.patch;apply=yes \
-file://cm-t35/0003-omap3-cm-t35-update-defconfig-for-DSS2.patch;apply=yes \
-file://cm-t35/0006-omap3-cm-t35-update-defconfig.patch;apply=yes \
-file://0001-ARM-OMAP-Overo-Add-support-for-second-ethernet-po.patch;apply=yes \
-file://0003-drivers-net-smsc911x-return-ENODEV-if-device-is-n.patch;apply=yes \
-file://0004-drivers-input-touchscreen-ads7846-return-ENODEV.patch;apply=yes \
-file://0005-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board.patch;apply=yes \
-file://0006-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch;apply=yes \
-file://0007-ASoC-enable-audio-capture-by-default-for-twl4030.patch;apply=yes \
-file://0009-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch;apply=yes \
-file://madc/0009-drivers-mfd-add-twl4030-madc-driver.patch;apply=yes \
-file://madc/0010-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch;apply=yes \
-file://madc/0011-ARM-OMAP-Add-twl4030-madc-support-to-Beagle.patch;apply=yes \
-file://madc/0013-ARM-OMAP-Add-missing-twl4030-madc-header-file.patch;apply=yes \
-file://dss2/0012-OMAP-DSS2-Add-support-for-LG-Philips-LB035Q02-pane.patch;apply=yes \
-#file://dss2/0014-OMAP-DSS-Add-DSS2-support-for-Overo.patch;apply=yes \
-file://dss2/0015-OMAP-DSS-Add-DSS2-support-for-Beagle.patch;apply=yes \
-file://dss2/0016-video-add-timings-for-hd720.patch;apply=yes \
+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.34.bb b/recipes/kexecboot/linux-kexecboot_2.6.34.bb
index 3a4bb63..97293e1 100644
--- a/recipes/kexecboot/linux-kexecboot_2.6.34.bb
+++ b/recipes/kexecboot/linux-kexecboot_2.6.34.bb
@@ -8,7 +8,7 @@ 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;apply=yes;status=pending \
+           file://ARM-Add-support-for-LZMA-compressed-kernel-images.patch;status=pending \
            file://defconfig"
 
 SRC_URI[kernel.md5sum] = "10eebcb0178fb4540e2165bfd7efc7ad"
diff --git a/recipes/kexecboot/linux-kexecboot_git.bb b/recipes/kexecboot/linux-kexecboot_git.bb
index df2d17f..0f8a425 100644
--- a/recipes/kexecboot/linux-kexecboot_git.bb
+++ b/recipes/kexecboot/linux-kexecboot_git.bb
@@ -5,7 +5,7 @@ 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;apply=yes;status=pending \
+           file://ARM-Add-support-for-LZMA-compressed-kernel-images.patch;status=pending \
            file://defconfig"
 
 S = "${WORKDIR}/git"
diff --git a/recipes/keylaunch/keylaunch_2.0.10.bb b/recipes/keylaunch/keylaunch_2.0.10.bb
index 24d3a3a..ea8a6fc 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;apply=yes file://unbreak-keyevents.patch;patch=1"
+SRC_URI += " file://makefile-fix.patch file://unbreak-keyevents.patch;patch=1"
 
 export CVSBUILD="no"
 
diff --git a/recipes/keyring/keyring_0.6.8.bb b/recipes/keyring/keyring_0.6.8.bb
index e456311..3908006 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;apply=yes"
+	   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 0c624e3..b62c371 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;apply=yes \
-           file://fix-desktop-file.patch;apply=yes \
-           file://gcc4.patch;apply=yes"
+           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 a66393a..f69af3a 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;apply=yes \
-            file://string_h.patch;apply=yes"
+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 7b7ad3c..a58a6d7 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;apply=yes;striplevel=0 \
-            file://kismet-2008-05-R1-fmt.diff;apply=yes;striplevel=0 \
-            file://kismet-2008-05-R1-infinite-loop.diff;apply=yes;striplevel=0 \
-            file://kismet-2008-05-R1-nonvoid.diff;apply=yes;striplevel=0 \
-            file://fix_strip.patch;apply=yes"
+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-common.inc b/recipes/klibc/klibc-common.inc
index 06c77e9..7b7a3cb 100644
--- a/recipes/klibc/klibc-common.inc
+++ b/recipes/klibc/klibc-common.inc
@@ -24,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;apply=yes"
-SRC_URI_append_linux-uclibceabi = "file://klibc-config-eabi.patch;apply=yes"
+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_1.5.15+1.5.16.inc b/recipes/klibc/klibc_1.5.15+1.5.16.inc
index 8318059..f638e14 100644
--- a/recipes/klibc/klibc_1.5.15+1.5.16.inc
+++ b/recipes/klibc/klibc_1.5.15+1.5.16.inc
@@ -4,20 +4,20 @@ 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;apply=yes \
+            file://1.5.15+1.5.16.patch \
             "
 
-SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch;apply=yes \
-            file://modprobe.patch;apply=yes \
-            file://losetup.patch;apply=yes \
-            file://dash_readopt.patch;apply=yes \
-            file://wc.patch;apply=yes \
-            file://staging.patch;apply=yes \
-            file://klibc_kexecsyscall.patch;apply=yes \
-            file://mntproc-definitions.patch;apply=yes \
-            file://signal-cleanup.patch;apply=yes \
-            file://isystem.patch;apply=yes \
-            file://socket.h.patch;apply=yes \
+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"
diff --git a/recipes/klibc/klibc_1.5.15.inc b/recipes/klibc/klibc_1.5.15.inc
index 57c48ab..22bd84c 100644
--- a/recipes/klibc/klibc_1.5.15.inc
+++ b/recipes/klibc/klibc_1.5.15.inc
@@ -1,15 +1,15 @@
 require klibc-common.inc
 
-SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch;apply=yes \
-            file://modprobe.patch;apply=yes \
-            file://losetup.patch;apply=yes \
-            file://dash_readopt.patch;apply=yes \
-            file://wc.patch;apply=yes \
-            file://staging.patch;apply=yes \
-            file://klibc_kexecsyscall.patch;apply=yes \
-            file://mntproc-definitions.patch;apply=yes \
-            file://signal-cleanup.patch;apply=yes \
-            file://isystem.patch;apply=yes \
+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 \
             "
 
 KLIBC_FETCHDIR = "1.5"
diff --git a/recipes/klibc/klibc_1.5.17.inc b/recipes/klibc/klibc_1.5.17.inc
index 6f28c60..69d0dc7 100644
--- a/recipes/klibc/klibc_1.5.17.inc
+++ b/recipes/klibc/klibc_1.5.17.inc
@@ -1,13 +1,13 @@
 require klibc-common.inc
 
-SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch;apply=yes \
-            file://modprobe.patch;apply=yes \
-            file://dash_readopt.patch;apply=yes \
-            file://wc.patch;apply=yes \
-            file://staging.patch;apply=yes \
-            file://klibc_kexecsyscall.patch;apply=yes \
-            file://mntproc-definitions.patch;apply=yes \
-            file://isystem.patch;apply=yes \
+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"
diff --git a/recipes/klibc/klibc_1.5.18.inc b/recipes/klibc/klibc_1.5.18.inc
index 9572acf..c426b06 100644
--- a/recipes/klibc/klibc_1.5.18.inc
+++ b/recipes/klibc/klibc_1.5.18.inc
@@ -1,13 +1,13 @@
 require klibc-common.inc
 
-SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch;apply=yes \
-            file://modprobe.patch;apply=yes \
-            file://dash_readopt.patch;apply=yes \
-            file://wc.patch;apply=yes \
-            file://staging.patch;apply=yes \
-            file://klibc_kexecsyscall.patch;apply=yes \
-            file://mntproc-definitions.patch;apply=yes \
-            file://isystem.patch;apply=yes \
+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"
diff --git a/recipes/klibc/klibc_1.5.inc b/recipes/klibc/klibc_1.5.inc
index 70067aa..b00f02c 100644
--- a/recipes/klibc/klibc_1.5.inc
+++ b/recipes/klibc/klibc_1.5.inc
@@ -1,12 +1,12 @@
 require klibc-common.inc
 
-SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch;apply=yes \
-            file://modprobe.patch;apply=yes \
-            file://losetup.patch;apply=yes \
-            file://dash_readopt.patch;apply=yes \
-            file://wc.patch;apply=yes \
-            file://staging.patch;apply=yes \
-            file://klibc_kexecsyscall.patch;apply=yes \
+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 \
             "
 
 KLIBC_FETCHDIR = "1.5"
diff --git a/recipes/knights/knights_1.14.bb b/recipes/knights/knights_1.14.bb
index 016b76f..4e64a63 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;apply=yes \
-           file://gcc3.patch;apply=yes"
+           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 e7d14d9..a22894e 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;apply=yes \
-					 file://kobodeluxe-putenv.patch;apply=yes \
-					 file://kobodeluxe-sysconf-support.patch;apply=yes \
-					 file://kobodeluxe-menu-pointer.patch;apply=yes \
-					 file://kobodeluxe-dimension-autoswap.patch;apply=yes \
+					 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 0c7c753..264ae7b 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;apply=yes \
-           file://packing.patch;apply=yes \
-           file://include_qconfig.patch;apply=yes \
-           file://useragent.patch;apply=yes \
-           file://kcookiejar-merge.patch;apply=yes \
-           file://malformed.patch;apply=yes \
-           file://cachepath.patch;apply=yes \
-           file://vit.patch;apply=yes \
-           file://gcc4.patch;apply=yes \
+           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 88c0ecd..177b5df 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;apply=yes \
-	   file://dont-use-kde-config.patch;apply=yes"
+           file://gcc4.patch \
+	   file://dont-use-kde-config.patch"
 # uncomment this for a static build
-#          file://inject-extraflags.patch;apply=yes"
+#          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 3f60883..06d422f 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;apply=yes \
-           file://konqe_new_opie.patch;apply=yes \
-	   file://konqe-kapplication.patch;apply=yes \
-           file://fix_configure.patch;apply=yes \
-           file://fix_acinclude.patch;apply=yes \
-           file://fix_KDE_LDPATH_HACK.patch;apply=yes \
+	   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 e25cdcf..3394994 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 e72fe5c..662299d 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;apply=yes"
+	   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 9e8e4bc..e91a8ad 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;apply=yes \
+    file://makefile.patch \
     "
 
 do_compile() {
diff --git a/recipes/lame/lame_3.96.1.bb b/recipes/lame/lame_3.96.1.bb
index 97de2e0..dca8bc9 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;apply=yes \
-	file://Makefile-lm.patch;apply=yes \
-	file://ldflags-qa.patch;apply=yes"
+	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 27fd2d7..e9aabaa 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;apply=yes \
-	file://ldflags-qa.patch;apply=yes"
+	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 07d473f..5c7272b 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;apply=yes \ 
+           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 925f6e6..6f303d1 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;apply=yes;striplevel=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 ae0a8b7..d9c1312 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;apply=yes \
-	file://000_libtool_linking.diff;apply=yes \
-	file://010_rebootstrap-small.diff;apply=yes \
-	file://020_bad_integer_cast.diff;apply=yes \
-	file://020_missing_xm_h.diff;apply=yes \
-	file://020_render_table_crash.diff;apply=yes \
-	file://020_unsigned_int.diff;apply=yes \
-	file://020_xpmpipethrough.diff;apply=yes \
-	file://021_xim_chained_list_crash.diff;apply=yes \
-	file://030_manpage.diff;apply=yes \
-	file://disable-docs.patch;apply=yes \
+	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 d310b0b..7cf630e 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;apply=yes"
+           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 53ea300..458fc30 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;apply=yes "
+	   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 90e80ae..3ffadcb 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;apply=yes"
+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 1a6b89d..815c96f 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;apply=yes \
-           file://destdir.patch;apply=yes"
+           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 618982e..ffe9561 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;apply=yes"
+	   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 263c93a..ebcb981 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;apply=yes \
+	   file://make.patch \
 	"
 
 S = "${WORKDIR}/libcap-${PV}"
diff --git a/recipes/libcap/libcap_1.10.bb b/recipes/libcap/libcap_1.10.bb
index 795ffc4..e6ca393 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;apply=yes \
-	   file://make.patch;apply=yes \
-	   file://syscall.patch;apply=yes"
+	   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 de0a585..901da2b 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;apply=yes \
-	file://02-ccaudio-stereo.diff;apply=yes \
-	file://03-ccaudio-dtmf-reset.diff;apply=yes"
+	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 f6a80f4..c872f69 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;apply=yes"
+	   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 fc28545..89c0da9 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;apply=yes \
+           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 231109c..fbe9dd9 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;apply=yes"
+           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 08f6ab8..576314c 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;apply=yes "
+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 42410dc..55944dd 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;apply=yes "
+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 21b1389..fc75cc0 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;apply=yes"
+           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 8ddeb51..1308f71 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;apply=yes \
+	   file://0001-big-fat-autotools-patch.patch \
 	  "
 
 S = "${WORKDIR}/${PN}0.86-${PV}"
diff --git a/recipes/libdisplaymigration/libdisplaymigration_0.28.bb b/recipes/libdisplaymigration/libdisplaymigration_0.28.bb
index 9b7f86e..659f05b 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;apply=yes"
+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 d351a07..60e20da 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;apply=yes"
+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 db2fe9c..077d1f1 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;apply=yes"
+	  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 20ccadf..8f8e4b0 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;apply=yes"
+	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 3434bb7..5b6257a 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;apply=yes \
-          file://gcc4.patch;apply=yes \
-          file://ldflags.patch;apply=yes"
+          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 91da991..9b9b87d 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;apply=yes;name=patch \
-  file://libeasysoap++0-0.6.1/libeasysoap++0-0.6.1-template-keyword-qualifier-swb.patch;apply=yes \
-  file://libeasysoap++0-0.6.1/libeasysoap++0-0.6.1-compile-errors-swb.patch;apply=yes \
-  file://libeasysoap++0-0.6.1/libeasysoap++0-0.6.1-autoreconf-fixes-swb.patch;apply=yes"
+  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 91dbc64..0963165 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;apply=yes \
-	file://libedit-add-soname.diff;apply=yes;striplevel=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 ad93c00..d46e33f 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;apply=yes"
+		  file://nomagic.diff"
 
 EXTRA_OECONF = "--disable-magic"
 
diff --git a/recipes/libetpan/libetpan_0.46.bb b/recipes/libetpan/libetpan_0.46.bb
index b8d1b00..a3bee28 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;apply=yes"
+           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 acb3f49..5e8b520 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;apply=yes"
+           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 86ceb61..37599fc 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;apply=yes \
-           file://libetpan-ldflags.patch;apply=yes"
+	   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 52e7d3d..84912fb 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;apply=yes"
+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 3f429a6..f4385df 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;apply=yes"
+           file://stdargs.patch"
 
 do_stage() {
 	oe_libinstall -C src -a libevnet ${STAGING_LIBDIR}
diff --git a/recipes/libexosip2/libexosip2_2.2.3.bb b/recipes/libexosip2/libexosip2_2.2.3.bb
index 71ef977..dd70828 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;apply=yes"
+           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 71980cb..89aa223 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;apply=yes"
+	   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 3e1f462..ceb46b1 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;apply=yes"
+	   file://soname.patch"
 
 MIRRORS_prepend () {
 ${GNU_MIRROR}/gcc/	http://gcc.get-software.com/releases/
diff --git a/recipes/libffi/libffi_3.0.8.bb b/recipes/libffi/libffi_3.0.8.bb
index c35bb28..b31d9ee 100644
--- a/recipes/libffi/libffi_3.0.8.bb
+++ b/recipes/libffi/libffi_3.0.8.bb
@@ -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;apply=yes"
+           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 5a1fa9f..4e1ae87 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;apply=yes"
+           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 9f4d638..c46909b 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;apply=yes"
+           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 1b564f2..4a142f6 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;apply=yes"
+           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 5bc0f72..56be4c0 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;apply=yes \
+	   file://autotools.patch \
 	  "
 
 inherit autotools binconfig pkgconfig
diff --git a/recipes/libftdi/libftdi_0.9.bb b/recipes/libftdi/libftdi_0.9.bb
index c1801b5..1874bce 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;apply=yes"
+           file://doxygen-configure.patch"
 S = "${WORKDIR}/libftdi-${PV}"
 
 inherit autotools
diff --git a/recipes/libgcrypt/libgcrypt.inc b/recipes/libgcrypt/libgcrypt.inc
index af2c800..f29dc8d 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;apply=yes \
-           file://mips-h-constraint.patch;apply=yes"
+           file://add-pkgconfig-support.patch \
+           file://mips-h-constraint.patch"
 
 inherit autotools binconfig pkgconfig lib_package
 
diff --git a/recipes/libglade/libglade_2.0.1.bb b/recipes/libglade/libglade_2.0.1.bb
index 8fb8514..5971e53 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;apply=yes;striplevel=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 4c2608f..ab53763 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;apply=yes file://no-xml2.patch;patch=1"
+SRC_URI += "file://glade-cruft.patch file://no-xml2.patch;patch=1"
 
 EXTRA_OECONF += "--without-libxml2"
 
diff --git a/recipes/libglade/libglade_2.4.2.bb b/recipes/libglade/libglade_2.4.2.bb
index 6ef0b6f..de77637 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;apply=yes file://no-xml2.patch;patch=1"
+SRC_URI += "file://glade-cruft.patch file://no-xml2.patch;patch=1"
 
 EXTRA_OECONF += "--without-libxml2"
 
diff --git a/recipes/libglade/libglade_2.5.1.bb b/recipes/libglade/libglade_2.5.1.bb
index 01a7745..6f35a07 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;apply=yes file://no-xml2.patch;patch=1 \
-	    file://no-deprecation.patch;apply=yes"
+SRC_URI += "file://glade-cruft.patch file://no-xml2.patch;patch=1 \
+	    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 8ae7622..0ff8d57 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;apply=yes file://no-xml2.patch;patch=1"
+SRC_URI += "file://glade-cruft.patch file://no-xml2.patch;patch=1"
 
 EXTRA_OECONF += "--without-libxml2"
 
diff --git a/recipes/libglade/libglade_2.6.4.bb b/recipes/libglade/libglade_2.6.4.bb
index fe32973..1a1eed9 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;apply=yes file://no-xml2.patch;patch=1"
+SRC_URI += "file://glade-cruft.patch file://no-xml2.patch;patch=1"
 
 EXTRA_OECONF += "--without-libxml2"
 
diff --git a/recipes/libgmime/gmime_2.4.10.bb b/recipes/libgmime/gmime_2.4.10.bb
index f0f1a89..a70609d 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;apply=yes"
+	   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 16b2f51..ee0d283 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;apply=yes \
-	   file://configure-ldflags-cross.patch;apply=yes"
+	   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 04c6acd..2e2db3d 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;apply=yes \
+           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 242f280..f7887db 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;apply=yes"
+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 1785761..0ca2832 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;apply=yes"
+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 febe759..810bdb6 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;apply=yes;striplevel=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 8c4e9e7..d60cc0f 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;apply=yes;striplevel=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 d034dca..104843c 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;apply=yes;striplevel=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 cc8fac9..cfe09af 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;apply=yes"
+	   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 9ccf753..947d4f2 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;apply=yes"
+	   file://pkgconfig.patch"
 
 SRC_URI[md5sum] = "5340fa28c365049c995996e8dc0f880c"
 SRC_URI[sha256sum] = "e8eb2c3a844a080144cbb994118e5110b08bc0f608f8c3f2f1977211167bda76"
diff --git a/recipes/libgsm/libgsm_1.0.12.bb b/recipes/libgsm/libgsm_1.0.12.bb
index f5a6a2f..a0b5e76 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;apply=yes \
-           file://02_cplusplus.patch;apply=yes \
-           file://03_config.patch;apply=yes \
-           file://04_includes.patch;apply=yes \
-           file://05_compiler_warnings.patch;apply=yes \
+	   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 62bd6da..04333bc 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;apply=yes \
+	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 32b9706..1c3cdc7 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;apply=yes"
+           file://pthread-link.patch"
 
 
 inherit autotools
diff --git a/recipes/libiconv/libiconv.inc b/recipes/libiconv/libiconv.inc
index 17642a6..6bb85ef 100644
--- a/recipes/libiconv/libiconv.inc
+++ b/recipes/libiconv/libiconv.inc
@@ -6,8 +6,8 @@ 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;apply=yes \
-	   file://preload.patch;apply=yes"
+	   file://autotools.patch \
+	   file://preload.patch"
 
 S = "${WORKDIR}/libiconv-${PV}"
 
diff --git a/recipes/liblockfile/liblockfile_1.06.bb b/recipes/liblockfile/liblockfile_1.06.bb
index b4e2612..0235dbd 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;apply=yes \
-	   file://configure.patch;apply=yes \
-	   file://ldflags.patch;apply=yes \
-	   file://glibc-2.4.patch;apply=yes"
+	   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 76be82e..bab40d0 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;apply=yes \
-	   file://mad.diff;apply=yes \
-	   file://mad-mips-h-constraint.patch;apply=yes"
+           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;apply=yes"
+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 830cedc..b49aabc 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;apply=yes \
-  file://configure_fixes.patch;apply=yes \
-  file://reset-sigchld.patch;apply=yes \
+  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 7c8951b..266a0d4 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;apply=yes"
+           file://Makefile-0.7.patch"
 
 
 
diff --git a/recipes/libmatthew/libmatthew_0.7.bb b/recipes/libmatthew/libmatthew_0.7.bb
index 57e7343..03a7149 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;apply=yes"
+           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 71ddbfb..fdc87ce 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;apply=yes \
-  file://autofoo.patch;apply=yes \
-  file://ldflags.patch;apply=yes \
+  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 04bd08d..61cbdbc 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;apply=yes \
-  file://autofoo.patch;apply=yes \
+  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 3098d83..3ea46e5 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;apply=yes"
+	   file://mimedir-duration.diff"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/libmng/libmng_1.0.8.bb b/recipes/libmng/libmng_1.0.8.bb
index 9235ca8..c7aeafa 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;apply=yes"
+           file://ldflags.patch"
 
 inherit pkgconfig
 
diff --git a/recipes/libmrss/libmrss_0.17.2.bb b/recipes/libmrss/libmrss_0.17.2.bb
index 0727247..050a52d 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;apply=yes"
+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 bee95c5..053feb2 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;apply=yes \
-	   file://configure.uclibc.patch;apply=yes \
-	   file://configure_x86-64-host.patch;apply=yes \
+	   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 1a3dd92..b09f56e 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;apply=yes \
-           file://fix-endianess-test.patch;apply=yes \
-           file://new-autotools.patch;apply=yes"
+           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 3cbc139..4813baa 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;apply=yes"
+  file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/libnids/libnids_1.24.bb b/recipes/libnids/libnids_1.24.bb
index 0164cb0..749b1e9 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;apply=yes"
+  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 b0635ff..08c1b63 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;apply=yes \
+  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 0f15d56..0659d93 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;apply=yes \
-  file://fix-includes.patch;apply=yes \
-  file://respect-ldflags.patch;apply=yes \
-  file://netlink-local-fix.patch;apply=yes \
+  file://local-includes.patch \
+  file://fix-includes.patch \
+  file://respect-ldflags.patch \
+  file://netlink-local-fix.patch \
 "
 
 
diff --git a/recipes/libogg/libogg_1.1.bb b/recipes/libogg/libogg_1.1.bb
index 3748a54..edc586e 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;apply=yes"
+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 7f55e58..8d6047c 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;apply=yes"
+           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 3de737b..70dc5e2 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;apply=yes \
-	   file://arm-vfp.patch;apply=yes \
+	   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 0b39dac..21bf6a2 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;apply=yes \
-	   file://odevice_jornada.cpp-fixup.patch;apply=yes"
+           file://odevice.h-jornada-fixup.patch \
+	   file://odevice_jornada.cpp-fixup.patch"
 
-SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;apply=yes"
+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 39ec5bc..42f5784 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;apply=yes \
-           file://h4000_and_default_rot.patch;apply=yes \
-           file://ipaq_rotate_fix.patch;apply=yes \
-           file://spitz_rotate_fix.patch;apply=yes \
-           file://c7x0_w100_disable.patch;apply=yes"
+           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;apply=yes"
+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 99eccae..24ed884 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;apply=yes \
-           file://c7x0_w100_disable.patch;apply=yes \
-           file://rotate_fix.patch;apply=yes"
+           file://libopie2-tosa.patch \
+           file://c7x0_w100_disable.patch \
+           file://rotate_fix.patch"
 
-SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;apply=yes"
+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 3834686..7f9edc3 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;apply=yes"
+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 aa01a98..5670c67 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;apply=yes"
+           file://disable-bt-check.patch"
diff --git a/recipes/libopieobex/libopieobex0_1.2.4.bb b/recipes/libopieobex/libopieobex0_1.2.4.bb
index 024e47d..570276b 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;apply=yes"
+           file://disable-bt-check.patch"
diff --git a/recipes/libopieobex/libopieobex0_cvs.bb b/recipes/libopieobex/libopieobex0_cvs.bb
index cc591c7..e120a25 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;apply=yes"
+           file://disable-bt-check.patch"
diff --git a/recipes/libpcap/libpcap.inc b/recipes/libpcap/libpcap.inc
index c42b880..ce6bbd6 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;apply=yes"
+           file://shared.patch"
 
 inherit autotools
 
diff --git a/recipes/libpcap/libpcap_0.9.8.bb b/recipes/libpcap/libpcap_0.9.8.bb
index c350033..ea95301 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;apply=yes"
+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 e950a96..cbe38e8 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;apply=yes"
-SRC_URI += "file://ieee80215-arphrd.patch;apply=yes"
-SRC_URI += "file://ldflags.patch;apply=yes"
-SRC_URI += "file://0001-Fix-some-problems-that-show-up-in-autoconf-2.64-and-.patch;apply=yes"
+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 a5a7766..b0eff17 100644
--- a/recipes/libpcre/libpcre_7.6.bb
+++ b/recipes/libpcre/libpcre_7.6.bb
@@ -8,7 +8,7 @@ SECTION = "devel"
 PR = "r7"
 LICENSE = "BSD"
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \
-           file://pcre-cross.patch;apply=yes"
+           file://pcre-cross.patch"
 S = "${WORKDIR}/pcre-${PV}"
 
 PROVIDES = "pcre"
diff --git a/recipes/libpng/libpng_1.2.37.bb b/recipes/libpng/libpng_1.2.37.bb
index 46ef35c..950ebb4 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;apply=yes"
+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 4371150..80d87bc 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;apply=yes"
+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 fa04f82..2389915 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;apply=yes"
+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 66baeb9..d37f7e3 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;apply=yes"
+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 568e893..8cb2ce9 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;apply=yes \
-	file://fix-titleheight.patch;apply=yes"
+	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 a97eea6..2b50fca 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;apply=yes \
-           file://unbreak-logging.patch;apply=yes \
-           file://citytime-path.patch;apply=yes \
-           file://fix-sd-card-path.patch;apply=yes \
+           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 2fa784a..a1373d3 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;apply=yes \
-           file://unbreak-logging.patch;apply=yes \
-           file://citytime-path-2.patch;apply=yes \
-           file://no-include-pro.patch;apply=yes \
-           file://unhide_lnkproperties_destructor.patch;apply=yes \
+           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 3d44400..6ba11ce 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;apply=yes \
-           file://unbreak-logging.patch;apply=yes \
-           file://citytime-path-2.patch;apply=yes \
-           file://no-include-pro.patch;apply=yes \
+           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 30a7f88..ce174bf 100644
--- a/recipes/librcf/librcf_0.4.bb
+++ b/recipes/librcf/librcf_0.4.bb
@@ -8,8 +8,8 @@ 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;apply=yes \
-	file://rcf-0.4-openembedded.diff;apply=yes"
+	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 03ddf18..ef8faa2 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;apply=yes \
-           file://011-rc632-define-fixes-followups.patch;apply=yes \
-           file://012-rc632-error-reg-ro-2.patch;apply=yes \
-           file://013-zero-UID.patch;apply=yes \
-           file://015-no_segfault.patch;apply=yes \
-           file://soos01-set_clear_bits.patch;apply=yes \
-           file://soos02-check-errors.patch;apply=yes \
-           file://soos03-no_hang-openpcd.patch;apply=yes \
+           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;apply=yes"
+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 b178c72..737e934 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;apply=yes;striplevel=0 \
-           file://libsamplerate-0.1.7-tests.patch;apply=yes "
+           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 4d84ed2..172e2b1 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;apply=yes \
-  file://pagesize.patch;apply=yes \
-  file://kernel-asm-page.patch;apply=yes \
-  file://sdl-cdfix.patch;apply=yes \
-  file://fixmfour.patch;apply=yes \
+  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 01c27d2..d847774 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;apply=yes \
+  file://explicit-extern-C.patch \
   file://acinclude.m4 \
-  file://directfb_obsolete_calls.patch;apply=yes \
+  file://directfb_obsolete_calls.patch \
 "
 
 CFLAGS_append  += " -I${STAGING_INCDIR}/directfb -I${STAGING_INCDIR}/directfb-internal"
diff --git a/recipes/libsdl/libsdl-image_1.2.3.bb b/recipes/libsdl/libsdl-image_1.2.3.bb
index e782018..9f93e17 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;apply=yes \
+  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 9274842..2217ef2 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;apply=yes"
+           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 73fa1ba..2a3eed2 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;apply=yes "
+	   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 443871e..d4183de 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;apply=yes \
+	   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 c326ffa..a9e3883 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;apply=yes \
-  file://pygame-1.2.9.patch;apply=yes \
-  file://mouse-1.2.9.patch;apply=yes \
-  file://kill-stdc++-1.2.9.patch;apply=yes \
-  file://ipaq-1.2.9.patch;apply=yes \
-  file://SDL-Akita-1.2.9.patch;apply=yes \
-  file://fixlibs-1.2.9.patch;apply=yes \
-  file://explicit-extern-C.patch;apply=yes \
-  file://no-PAGE_SIZE.patch;apply=yes \
-  file://fix_Makefile.am.patch;apply=yes \
-  file://fix_configure.in.patch;apply=yes \
+  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 c1934a9..c011f6a 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;apply=yes"
+           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 b344442..afa9d58 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;apply=yes \
-  file://pagesize.patch;apply=yes \
-  file://kernel-asm-page.patch;apply=yes \
-  file://sdl-cdfix.patch;apply=yes \
-  file://fixmfour.patch;apply=yes \
-  file://libsdl-1.2.11-pagesize.patch;apply=yes \
+  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 2849d96..9f748e1 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;apply=yes \
-  file://pagesize.patch;apply=yes \
-  file://remove_path.patch;apply=yes \
+  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 fc9afbc..b6eb92c 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;apply=yes"
+           file://libsexy-pkgconfig-fixes.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/libsidplay/libsidplay_1.36.59.bb b/recipes/libsidplay/libsidplay_1.36.59.bb
index 44815c7..b7007f9 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;apply=yes;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 1723bb5..2c32f14 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;apply=yes \
-	   file://pkgconfig.patch;apply=yes"
+	   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 41b9529..c68105b 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;apply=yes \
-           file://disable-tests.patch;apply=yes"
+	   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 912d331..474b2fd 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;apply=yes "
+           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 182b573..47fe000 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;apply=yes"
+	   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 1089b19..6bdb4d7 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;apply=yes \
-  file://libsigcx-0.6.4-build-swb.patch;apply=yes \
-  file://libsigcx-0.6.4-fix-ac-try-run-swb.patch;apply=yes \
-  file://libsigcx-200505061-fix-dist-swb.patch;apply=yes \
-  file://libsigcx-0.6.4-pack-predeclare-swb.patch;apply=yes \
-  file://autotool-regen.patch;apply=yes"
+  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 ccd1070..cd8a802 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;apply=yes"
+           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 e7f94b3..b0117cb 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;apply=yes"
+           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 a1a7bb8..deaae7b 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;apply=yes \
+  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 fc3b964..d4256f5 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;apply=yes \
-	file://libstroke-Makefile.am.patch;apply=yes \
-	file://tests-Makefile.am.patch;apply=yes \
+	file://configure.in.patch \
+	file://libstroke-Makefile.am.patch \
+	file://tests-Makefile.am.patch \
 	"
-#	file://Makefile.am.patch;apply=yes \
-#	file://libgstroke-Makefile.am.patch;apply=yes \
+#	file://Makefile.am.patch \
+#	file://libgstroke-Makefile.am.patch \
 
 inherit autotools pkgconfig
 
diff --git a/recipes/libtheora/libtheora_1.0.bb b/recipes/libtheora/libtheora_1.0.bb
index 163c7af..3372291 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;apply=yes"
+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 ba0c753..07e621b 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;apply=yes"
+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 99c8eb5..9887df2 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;apply=yes"
+	  file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/libtool/libtool-cross_1.5.10.bb b/recipes/libtool/libtool-cross_1.5.10.bb
index b3c7ef9..78ebc45 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;apply=yes \
-                   file://libdir-la.patch;apply=yes \
-                   file://libdir-la2.patch;apply=yes \
-                   file://prefix.patch;apply=yes \
-                   file://tag.patch;apply=yes \
-                   file://install-path-check.patch;apply=yes \
-		   file://nmedit_fix.patch;apply=yes \
-		   file://nousrlib.patch;apply=yes"
+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 b9cf5a5..03d664a 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;apply=yes \
-                   file://prefix.patch;apply=yes \
-                   file://tag.patch;apply=yes \
-                   file://tag1.patch;apply=yes \
-#                   file://rpath.patch;apply=yes \
-                   file://install-path-check.patch;apply=yes"
+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 9d19f65..c8f53ca 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;apply=yes \
-                   file://prefix.patch;apply=yes \
-                   file://tag.patch;apply=yes \
-                   file://tag1.patch;apply=yes \
-                   file://install-path-check.patch;apply=yes"
+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 b37bef1..6e6caf9 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;apply=yes \
-  file://prefix.patch;apply=yes \
+  file://cross_compile.patch \
+  file://prefix.patch \
 "
 
 DEPENDS += "libtool-native"
 
 DOLT_PATCH = ""
-DOLT_PATCH_arm = " file://add_dolt.patch;apply=yes"
-DOLT_PATCH_i586 = " file://add_dolt.patch;apply=yes"
+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 44147c8..0303cbb 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;apply=yes \
-  file://prefix.patch;apply=yes \
+  file://cross_compile.patch \
+  file://prefix.patch \
 "
 
 DEPENDS += "libtool-native"
 
 DOLT_PATCH = ""
-DOLT_PATCH_arm = " file://add_dolt.patch;apply=yes"
-DOLT_PATCH_i586 = " file://add_dolt.patch;apply=yes"
+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 44147c8..0303cbb 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;apply=yes \
-  file://prefix.patch;apply=yes \
+  file://cross_compile.patch \
+  file://prefix.patch \
 "
 
 DEPENDS += "libtool-native"
 
 DOLT_PATCH = ""
-DOLT_PATCH_arm = " file://add_dolt.patch;apply=yes"
-DOLT_PATCH_i586 = " file://add_dolt.patch;apply=yes"
+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 28af0f4..304189c 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;apply=yes \
-                   file://libdir-la2.patch;apply=yes \
-                   file://prefix.patch;apply=yes \
-                   file://tag.patch;apply=yes \
-                   file://install-path-check.patch;apply=yes \
-		   file://nousrlib.patch;apply=yes"
+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 028fabf..dad2dc2 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;apply=yes \
-                   file://prefix.patch;apply=yes \
-                   file://tag.patch;apply=yes \
-                   file://tag1.patch;apply=yes \
-                   file://install-path-check.patch;apply=yes"
+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 a0e17e3..0e315e8 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;apply=yes \
-                   file://prefix.patch;apply=yes \
-                   file://tag.patch;apply=yes \
-                   file://tag1.patch;apply=yes \
-                   file://install-path-check.patch;apply=yes"
+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 f2ca52d..b241d0c 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;apply=yes \
-  file://prefix.patch;apply=yes \
+  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 f27e62e..fb83cf2 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;apply=yes \
-  file://prefix.patch;apply=yes \
+  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 992d0f5..d5c7139 100644
--- a/recipes/libtool/libtool-native_2.2.6b.bb
+++ b/recipes/libtool/libtool-native_2.2.6b.bb
@@ -2,8 +2,8 @@ require libtool_${PV}.bb
 PR = "${INC_PR}.1"
 
 SRC_URI += "\
-  file://cross_compile.patch;apply=yes \
-  file://prefix.patch;apply=yes \
+  file://cross_compile.patch \
+  file://prefix.patch \
 "
 
 inherit native
diff --git a/recipes/libtool/libtool-sdk_1.5.10.bb b/recipes/libtool/libtool-sdk_1.5.10.bb
index f35b722..10ed23d 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;apply=yes \
-                   file://libdir-la.patch;apply=yes \
-                   file://libdir-la2.patch;apply=yes \
-                   file://prefix.patch;apply=yes \
-                   file://tag.patch;apply=yes \
-                   file://install-path-check.patch;apply=yes \
-                   file://nousrlib.patch;apply=yes \
-                   file://add_sysroot_function.patch;apply=yes \
+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 88083b9..5191ce3 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;apply=yes"
+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 f19d1b2..f7d6cb5 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;apply=yes"
+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 f19d1b2..f7d6cb5 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;apply=yes"
+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 b0d8480..56475ae 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;apply=yes \
-	   file://uclibc.patch;apply=yes \
-	   file://3figures.patch;apply=yes"
+           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 0335bf3..2278cec 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;apply=yes \
-	   file://uclibc.patch;apply=yes"
-#	   file://3figures.patch;apply=yes"
+           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 1576394..6e3655a 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;apply=yes \
-	   file://uclibc.patch;apply=yes \
-           file://never-ever-do-rpath.patch;apply=yes" 
+           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 303aa88..3a97d9e 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;apply=yes"
+           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 74ee671..0f81bc3 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;apply=yes"
+           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 6aa9e66..66d69af 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;apply=yes"
+           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 e540741..8684b0d 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;apply=yes"
+           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 125a920..13311b4 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;apply=yes"
+           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 e4bedd5..236af3c 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;apply=yes"
+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 e995551..25893c4 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;apply=yes"
+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 66ba5e1..3ff0ed3 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;apply=yes \
+           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 f567862..0f224a6 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;apply=yes"
+	   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 481606b..2e8e18a 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;apply=yes"
+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 862a250..069b83f 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;apply=yes \
-	   file://r14598-CVE-2008-1420.patch;apply=yes \
-	   file://r14602-CVE-2008-1419.patch;apply=yes \
-	   file://r14602-CVE-2008-1423.patch;apply=yes \
+	   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 3df3c68..04e6c91 100644
--- a/recipes/libvorbis/libvorbis_1.2.3.bb
+++ b/recipes/libvorbis/libvorbis_1.2.3.bb
@@ -4,7 +4,7 @@ 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;apply=yes \
+	   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 \
diff --git a/recipes/libwmf/libwmf-native_0.2.8.4.bb b/recipes/libwmf/libwmf-native_0.2.8.4.bb
index e07e421..0910955 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;apply=yes                   \
-           file://libwmf-0.2.8.4-useafterfree.patch;apply=yes"
+           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 cadcffc..889fcd4 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;apply=yes                   \
-           file://libwmf-0.2.8.4-useafterfree.patch;apply=yes"
+           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 a99f428..5cee197 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;apply=yes \
+	   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 dfd6c07..68209bd 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;apply=yes \
-	file://iconv.patch;apply=yes \
-	file://ffmpeg_headers.patch;apply=yes \
+    	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 a47f24f..5fb221d 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;apply=yes \
-	file://iconv.patch;apply=yes \
-	file://libpostproc.patch;apply=yes \
-	file://libavcodec.patch;apply=yes \
+    	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 da2ab5b..02a4069 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;apply=yes \
-           file://use-sane-default-font.patch;apply=yes"
+           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 4a7b675..deb8dd8 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;apply=yes"
+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 4c35e9e..344341c 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;apply=yes"
+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 4932386..f2c51f5 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;apply=yes"
+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 137a8ee..68374b5 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;apply=yes "
+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 11479af..f5ce0c0 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;apply=yes \
+           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 370efce..da37170 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;apply=yes"
+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 b26dfc4..e25dd06 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;apply=yes"
+SRC_URI += " file://pkgconfig_fix.patch"
 SRC_URI[archive.md5sum] = "d6a9a020a76a3db17848d769d6c9c8a9"
 SRC_URI[archive.sha256sum] = "4e1f39ee16596fd2a83d28d6c3b065f742254f3336f93ce8ed1cae48ecbe49da"
diff --git a/recipes/lighttpd/lighttpd_1.4.18.bb b/recipes/lighttpd/lighttpd_1.4.18.bb
index 5b85ccb..c9aac02 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;apply=yes \
-	    file://mod_redirect.c.patch;apply=yes \
-	    file://src-server.c.patch;apply=yes \
+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 2750d8c..ab8bf7a 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;apply=yes \
-           file://lilo-0.21-1.1.patch;apply=yes \
-           file://lilo.patch;apply=yes \
+           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;apply=yes \
-           file://lilo-0.21-second.patch;apply=yes;striplevel=0 \
-           file://lilo-sh-linux.patch;apply=yes \
-           file://lilo-linkgear.patch;apply=yes \
-           file://lilo-noconfig-h.patch;apply=yes \
-	   file://lilo-replace-PAGE_SIZE.patch;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 a466f6a..61b2a3d 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;apply=yes"
+           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 27dd33d..5fd698a 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;apply=yes"
+	file://liblinebreak-build-fix.patch"
 
 do_compile() {
 	oe_runmake release
diff --git a/recipes/linknx/linknx.inc b/recipes/linknx/linknx.inc
index ca93aa4..029589a 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;apply=yes \
+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 b19ee92..a195d0c 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;apply=yes \
+           file://logger-initialisations.patch \
            "
 
 require linknx.inc
diff --git a/recipes/links/links.inc b/recipes/links/links.inc
index a03d60d..c024985 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;apply=yes \
-           file://cookies-save-0.96.patch;apply=yes \
-           file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;apply=yes"
+           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 ab7b69a..44472a9 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;apply=yes \
-	file://gpe-cross-lossage.patch;apply=yes \
-	file://disable-gtk-doc.patch;apply=yes \
-	file://dotdesktop.patch;apply=yes \
-	file://segfault.patch;apply=yes"
+	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 98e6bd7..725819f 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;apply=yes \
-	file://disable-gtk-doc.patch;apply=yes"
+	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 6f7431d..735cfc7 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;apply=yes"
+           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 45097a3..335cd29 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;apply=yes;name=patch \
-           file://linphone-speex.diff;apply=yes"
+           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 2c5cb53..50df732 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;apply=yes \
-	file://preferences-segv.patch;apply=yes \
+	file://b64_assert.patch \
+	file://preferences-segv.patch \
 	"
 
 S = "${WORKDIR}/linphone-${PV}"
diff --git a/recipes/linux-ha/cluster-glue_1.0.5.bb b/recipes/linux-ha/cluster-glue_1.0.5.bb
index c44f08a..23fb5bb 100644
--- a/recipes/linux-ha/cluster-glue_1.0.5.bb
+++ b/recipes/linux-ha/cluster-glue_1.0.5.bb
@@ -10,10 +10,10 @@ PR = "r0"
 
 SRC_URI = " \
 	http://hg.linux-ha.org/glue/archive/glue-${PV}.tar.bz2;name=tar \
-	file://glue-remove-getpid-check.patch;apply=yes \
+	file://glue-remove-getpid-check.patch \
 	file://volatiles \
 	"
-SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch;apply=yes"
+SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch"
 SRC_URI[tar.md5sum] = "09721e2d2ab3c3fa6696b4347e31721a"
 SRC_URI[tar.sha256sum] = "c437a04494850b79c094f7e84d396e917ec09d9a2fdfb7c11f3b420741ea91a2"
 
diff --git a/recipes/linux-ha/cluster-resource-agents_1.0.3.bb b/recipes/linux-ha/cluster-resource-agents_1.0.3.bb
index fb21b24..d1736ff 100644
--- a/recipes/linux-ha/cluster-resource-agents_1.0.3.bb
+++ b/recipes/linux-ha/cluster-resource-agents_1.0.3.bb
@@ -6,10 +6,10 @@ PR = "r0"
 
 SRC_URI = " \
 	http://hg.linux-ha.org/agents/archive/agents-${PV}.tar.bz2;name=tar \
-	file://fix-header-defs-lookup.patch;apply=yes \
-	file://disable-doc-build.patch;apply=yes \
+	file://fix-header-defs-lookup.patch \
+	file://disable-doc-build.patch \
 	"
-SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch;apply=yes"
+SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch"
 SRC_URI[tar.md5sum] = "fcaa2cfd83a28d1965200e11db2ddd41"
 SRC_URI[tar.sha256sum] = "09b58332e34cf128c8d53d5bb4b3f61e402c2e0c0c809f5abae53ca144ad101e"
 
diff --git a/recipes/linux-hotplug/linux-hotplug_20040329.bb b/recipes/linux-hotplug/linux-hotplug_20040329.bb
index e2e9c70..c857a54 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;apply=yes \
+	   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 337d255..15338e6 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;apply=yes \
-	file://userspecified_hcd.patch;apply=yes \
-	file://hotplug-net-agent-usb.patch;apply=yes \
-	file://usbrc-busybox.patch;apply=yes \
+	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;apply=yes \
+	file://isapnp-exit.diff \
 	file://usb-storage \
 	file://soc.agent \
-	file://hotplug-binary-path.patch;apply=yes"
+	file://hotplug-binary-path.patch"
 
-SRC_URI_append_openzaurus = " file://quiet-pci.patch;apply=yes"
+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 3438394..627ab1c 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;apply=yes;striplevel=0 \
-	file://snes232.patch;apply=yes;striplevel=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.11.1.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
index 5079e95..0f925dd 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;apply=yes"
+	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 0120e93..3dafb32 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;apply=yes \
-	file://asm-arch-irqs.patch;apply=yes \
-	file://linux-netdevice.patch;apply=yes \
-	file://linux-netfilter_ipv4.patch;apply=yes \
-	file://linux-rtc.patch;apply=yes \
-	file://linux-videodev2.patch;apply=yes \
-	file://3477-1.patch;apply=yes"
+	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 c1300cf..d5494d4 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;apply=yes \
-	file://arm-unistd-syscall.patch;apply=yes \
-	file://linux-err.patch;apply=yes \
+	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 64310c3..8d88bf1 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;apply=yes"
+           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 d5d6126..f048ea3 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;apply=yes \
+           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 17843b1..742433f 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;apply=yes \
-           file://arm-hwcap-add-new-entries.patch;apply=yes"
+           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
index 0bc93ef..74876bf 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb
@@ -6,7 +6,7 @@ PR = "r4"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h \
-           file://unifdef.patch;apply=yes"
+           file://unifdef.patch"
 
 S = "${WORKDIR}/linux-${PV}"
 
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 08e399d..c4200e0 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;apply=yes \
-	   file://fix-kernel-conditionalize-a.out.h.patch;apply=yes \
-	   file://netfilter-include-types_h-in-userspace.patch;apply=yes \
+	   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;apply=yes"
+           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 4dd7230..0048f24 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;apply=yes \
+	   file://uio-header.patch \
 	  "
 # Not applied, see note in the patch:
-#	   file://asm-page.patch;apply=yes \
+#	   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 083c9e2..e3a27c5 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
@@ -7,7 +7,7 @@ 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;apply=yes \
+           file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch \
 	  "
 S = "${WORKDIR}/linux-${PV}"
 
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 412e407..16304df 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
@@ -7,7 +7,7 @@ PR = "r4"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-	   file://export_sa_family_t.patch;apply=yes \
+	   file://export_sa_family_t.patch \
 	  "
 S = "${WORKDIR}/linux-${PV}"
 
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 a7750ee..b66e768 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;apply=yes \
-	   file://keyboard.patch;apply=yes"
+	   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 98776cf..4893cab 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;apply=yes;striplevel=0 \
-	file://keyboard.patch;apply=yes"
+	file://mips-asm-atomic-system.diff;striplevel=0 \
+	file://keyboard.patch"
 
 S = "${WORKDIR}/linux-libc-headers-${PV}"
 
diff --git a/recipes/linux/LAB-kernel_2.6.13-hh2.bb b/recipes/linux/LAB-kernel_2.6.13-hh2.bb
index eb04d86..c5bca16 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;apply=yes \
+	   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 c6b61ea..97006b8 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;apply=yes \
-           file://disable-fbchanging.patch;apply=yes \
-           file://Makefile-remove-hard-setting-CROSS_COMPILE.patch;apply=yes \
+           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 f7943eb..3f46f36 100644
--- a/recipes/linux/compulab-pxa270_2.6.16.bb
+++ b/recipes/linux/compulab-pxa270_2.6.16.bb
@@ -12,7 +12,7 @@ do_unpack[depends] += "unzip-native:do_populate_sysroot"
 # 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;apply=yes \
+           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 f38d768..a747cfa 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;apply=yes \
+	   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 cea7339..4e3c858 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
@@ -8,7 +8,7 @@ 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;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;apply=yes;name=derevopatch \
+	   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 047e4b6..b17b5f7 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
@@ -7,7 +7,7 @@ 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;apply=yes;name=patch \
-           file://dynamic-phys-offset-2.6.20-rc7.diff;apply=yes \ 
+           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 0eb0a72..8d89ab0 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;apply=yes \
-       file://pxa-regs-additions.patch;apply=yes \
-       file://header.patch;apply=yes \
-       file://arch-config.patch;apply=yes \
-       file://board-init.patch;apply=yes \
-       file://compact-flash.patch;apply=yes \
-       file://flash.patch;apply=yes \
-       file://pxa2xx_udc.patch;apply=yes \
-       file://bkpxa-pxa-cpu.patch;apply=yes \
-       file://bkpxa-pxa-cpufreq.patch;apply=yes \
-       file://proc-gpio.patch;apply=yes \
-       file://serial-ether-addr.patch;apply=yes \
-       file://cpufreq-better-freqs.patch;apply=yes \
-       file://ethernet-config.patch;apply=yes \
-       file://smc-ether-addr.patch;apply=yes \
-       file://cpufreq-ondemand-by-default.patch;apply=yes \
-       file://modular-init-bluetooth.patch;apply=yes \
-       file://modular-init-smc91x.patch;apply=yes \
-       file://modular-init-usb-gadget.patch;apply=yes \
-       file://bugfix-i2c-include.patch;apply=yes \
-       file://bugfix-mmc-clock.patch;apply=yes \
-       file://bugfix-pxa-cpufreq.patch;apply=yes \
-       file://bugfix-serial-interrupt.patch;apply=yes \
-       file://bugfix-serial-register-status.patch;apply=yes \
-       file://mach-types-fix.patch;apply=yes \
-       file://pcm-gcc-411-bugfix.patch;apply=yes \
-       file://ucb1400-ac97-audio.patch;apply=yes \
-       file://gumstix-asoc.patch;apply=yes \
-       file://disable-uncompress-message.patch;apply=yes \
-       file://serial-divisor.patch;apply=yes \
-       file://mmc-card-detect.patch;apply=yes \
-       file://misalignment-handling.patch;apply=yes \
-       file://compile-fix-pxa_cpufreq.patch;apply=yes \
-       file://pxafb-definition.patch;apply=yes \
-       file://270-usb-gadget-udc.patch;apply=yes \
-       file://gumstix-pxa270-usb-host.patch;apply=yes \
-       file://cpufreq-fixup.patch;apply=yes \
-       file://uImage-in-own-partition.patch;apply=yes \
-       file://pxa-regs-fixup.patch;apply=yes \
-       file://gumstix-fb-logo.patch;apply=yes \
-       file://gumstix-pxa270-mmc.patch;apply=yes \
-       file://pxafb-18bpp-mode.patch;apply=yes \
-       file://smc911x-fixup.patch;apply=yes \
-       file://smc91x-fail-if-no-chip.patch;apply=yes \
-       file://one-wire.patch;apply=yes \
-       ${@base_contains('MACHINE_FEATURES', 'rgb16','file://pxafb-backto16.patch;apply=yes', '',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 5ed96ce..e32f35b 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;apply=yes \
-           http://gumstix.superlucidity.net/downloads/kernel/patches/linux-2.6.5-gnalm1-gum0.patch;apply=yes;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 e551786..6c3f98c 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;apply=yes \
-           file://usb-gadget-ether-compat.patch;apply=yes \
-	   file://linux-2.4-no-short-loads.patch;apply=yes \
-	   file://linux-2.4-cpufreq.patch;apply=yes"
+           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 d4e97bf..1de263a 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;apply=yes;name=uclinupatch \
-           ${SOURCEFORGE_MIRROR}/ipodlinux/uclinux-2.4.24-ipod0.patch.gz;apply=yes;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/linux-amsdelta-2.6_2.6.16-omap2.bb b/recipes/linux/linux-amsdelta-2.6_2.6.16-omap2.bb
index 49b1de1..b3557d5 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
@@ -6,14 +6,14 @@ 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;apply=yes;name=omap2patch \
-	http://the.earth.li/pub/e3/2.6.16/00-ams-delta-backlight.diff;apply=yes;name=amspatch1 \
-	http://the.earth.li/pub/e3/2.6.16/01-ams-delta-lcd.diff;apply=yes;name=amspatch2 \
-	http://the.earth.li/pub/e3/2.6.16/02-ams-delta-keypad.diff;apply=yes;name=amspatch3 \
-	http://the.earth.li/pub/e3/2.6.16/03-ams-delta-modem.diff;apply=yes;name=amspatch4 \
-	http://the.earth.li/pub/e3/2.6.16/04-omapfb-12bpp-support.diff;apply=yes;name=amspatch5 \
-	http://the.earth.li/pub/e3/2.6.16/05-ams-delta-nand.diff;apply=yes;name=amspatch6 \
-	http://the.earth.li/pub/e3/2.6.16/06-ams-delta-keyboard.diff;apply=yes;name=amspatch7 \
-	http://the.earth.li/pub/e3/2.6.16/08-ams-delta-sound.diff;apply=yes;name=amspatch8 \
+	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 08d5012..a59806d 100644
--- a/recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb
+++ b/recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb
@@ -10,7 +10,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2;name=ke
            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;apply=yes \
+           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 b030c5d..1e3f671 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;apply=yes;name=patch \
-           file://neon-jffs2-config.patch;apply=yes"
+           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-colinux_2.4.28.bb b/recipes/linux/linux-colinux_2.4.28.bb
index d6bf205..f7ceab2 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;apply=yes \
-	   file://nofpu.patch;apply=yes \
-	   file://shortloadbytes.patch;apply=yes \
-	   file://gcc-registerparanoia.patch;apply=yes \
-	   file://linux-2.4.24-attribute-used.patch;apply=yes \
-	   file://gcc340-fixes-v2.4.26-try3.patch;apply=yes \
+	   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 e242891..d86f3e2 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;apply=yes \
+	   file://colinux-${COLV}.patch \
 	   file://defconfig"
 
 S = "${WORKDIR}/linux-${PV}"
diff --git a/recipes/linux/linux-davinci_2.6.25.bb b/recipes/linux/linux-davinci_2.6.25.bb
index 1c0f693..919aee3 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;apply=yes \
+           file://8250_davinci.patch \
            file://defconfig"
 
-SRC_URI_append_davinci-sffsdr = " file://sffsdr.patch;apply=yes"
+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 8cee698..be3ad81 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;apply=yes \
-           file://0002-ARM-Mark-unsupported-syscalls-as-IGNORE.patch;apply=yes \
-           file://0003-Add-macros-for-enabling-a-UART.patch;apply=yes \
-           file://0004-Davinci-Enable-MAC-address-to-be-specified-on-kerne.patch;apply=yes \
-           file://0005-Add-DAS-Mini-DAS-and-AFE-USB-machine-types.patch;apply=yes \
-           file://0006-ALSA-ASoC-DaVinci-Fix-SFFSDR-compilation-error.patch;apply=yes \
-           file://0007-ALSA-ASoC-Davinci-Fix-SFFSDR-FPGA-module-codec-FS.patch;apply=yes \
-           file://0008-ALSA-ASoC-Davinci-Fix-incorrect-machine-type-for.patch;apply=yes \
-           file://0009-sound-ASoC-Fix-DaVinci-module-unload-error.patch;apply=yes \
-           file://0010-Add-generic-FPGA-bitstream-loader-driver.patch;apply=yes \
-           file://0011-Add-lyrvpss-example-driver-for-the-SFFSDR-board.patch;apply=yes \
-           file://0012-Update-SFFSDR-to-support-FPGA-and-lyrvpss-drivers.patch;apply=yes \
+           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 d629d85..601792b 100644
--- a/recipes/linux/linux-davinci_2.6.30.bb
+++ b/recipes/linux/linux-davinci_2.6.30.bb
@@ -17,18 +17,18 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.g
 
 # Need checking
 SRC_URI_append_davinci-sffsdr = " \
-           file://0001-USB-musb-cppi-bugfixes.patch;apply=yes \
-           file://0002-ARM-Mark-unsupported-syscalls-as-IGNORE.patch;apply=yes \
-           file://0003-Add-macros-for-enabling-a-UART.patch;apply=yes \
-           file://0004-Davinci-Enable-MAC-address-to-be-specified-on-kerne.patch;apply=yes \
-           file://0005-Add-DAS-Mini-DAS-and-AFE-USB-machine-types.patch;apply=yes \
-           file://0006-ALSA-ASoC-DaVinci-Fix-SFFSDR-compilation-error.patch;apply=yes \
-           file://0007-ALSA-ASoC-Davinci-Fix-SFFSDR-FPGA-module-codec-FS.patch;apply=yes \
-           file://0008-ALSA-ASoC-Davinci-Fix-incorrect-machine-type-for.patch;apply=yes \
-           file://0009-sound-ASoC-Fix-DaVinci-module-unload-error.patch;apply=yes \
-           file://0010-Add-generic-FPGA-bitstream-loader-driver.patch;apply=yes \
-           file://0011-Add-lyrvpss-example-driver-for-the-SFFSDR-board.patch;apply=yes \
-           file://0012-Update-SFFSDR-to-support-FPGA-and-lyrvpss-drivers.patch;apply=yes \
+           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 fae70fd..01259d9 100644
--- a/recipes/linux/linux-davinci_git.bb
+++ b/recipes/linux/linux-davinci_git.bb
@@ -71,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;apply=yes "
+                                     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 64c9ec6..a3fff9f 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;apply=yes;name=patch1 \
-	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-update1.patch;apply=yes;name=patch2 \
-	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_update2.patch;apply=yes;name=patch3 \
-	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_update3.patch;apply=yes;name=patch4 \
-	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_armtskit_update2.patch;apply=yes;name=patch5 \
-	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_ea3250.patch;apply=yes;name=patch6 \
-	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_update4.patch;apply=yes;name=patch7 \
-	http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_update5.patch;apply=yes;name=patch8 \
-	file://kernel-arm-2.6.27.8-lpc32xx_update5_fix.patch;apply=yes \
-	file://lpc32xx-spwm.patch;apply=yes \
+	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.20.20.bb b/recipes/linux/linux-efika_2.6.20.20.bb
index 57e777f..1dc73dc 100644
--- a/recipes/linux/linux-efika_2.6.20.20.bb
+++ b/recipes/linux/linux-efika_2.6.20.20.bb
@@ -43,7 +43,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2;name=k
            file://v4l.diff;p=1;apply=yes \
            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;apply=yes;name=shedpatch \
-           file://weaken-div64_32-symbol.patch;apply=yes \
+           file://weaken-div64_32-symbol.patch \
            file://defconfig \
 		   "
 
diff --git a/recipes/linux/linux-epia_2.6.19.2.bb b/recipes/linux/linux-epia_2.6.19.2.bb
index 7643407..77bfe52 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;apply=yes"
+	   file://linux-2.6-limits.patch"
 S = "${WORKDIR}/linux-${PV}"
 
 COMPATIBLE_HOST = 'i.86.*-linux'
diff --git a/recipes/linux/linux-geodegx_2.4.24.bb b/recipes/linux/linux-geodegx_2.4.24.bb
index 588bfcc..8976953 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;apply=yes \
-	file://linux-2.4.24-gcc340-fixes.patch;apply=yes \
+	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 c2a3e13..90e5cc9 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;apply=yes;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 bd11cf4..bc8b5e4 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;apply=yes \
-		   file://board-init.patch;apply=yes \
-		   file://compact-flash.patch;apply=yes \
-		   file://defconfig.patch;apply=yes \
-		   file://flash.patch;apply=yes \
-		   file://header.patch;apply=yes \
-		   file://kconfig-arch-cleanup.patch;apply=yes \
-		   file://pxa255-gpio-count-bugfix.patch;apply=yes \
-		   file://pxa2xx_udc.patch;apply=yes \
-		   file://bkpxa-pxa-cpu.patch;apply=yes \
-		   file://bkpxa-pxa-cpufreq.patch;apply=yes \
-		   file://bkpxa-pxa-ac97.patch;apply=yes \
-		   file://rmk-2022-2-rtctime-sa110-pxa255-driver.patch;apply=yes \
-		   file://proc-gpio.patch;apply=yes \
-		   file://serial-ether-addr.patch;apply=yes \
-		   file://cpufreq-better-freqs.patch;apply=yes \
-		   file://ethernet-config.patch;apply=yes \
-		   file://smc-ether-addr.patch;apply=yes \
-		   file://audio.patch;apply=yes \
-		   file://cpufreq-ondemand-by-default.patch;apply=yes \
-		   file://modular-init-bluetooth.patch;apply=yes \
-		   file://modular-init-smc91x.patch;apply=yes \
-		   file://modular-init-usb-gadget.patch;apply=yes \
-		   file://bugfix-i2c-include.patch;apply=yes \
-		   file://bugfix-mmc-clock.patch;apply=yes \
-		   file://bugfix-mtd-onenand.patch;apply=yes \
-		   file://bugfix-pxa-audio.patch;apply=yes \
-		   file://bugfix-pxa-cpufreq.patch;apply=yes \
-		   file://bugfix-pxa-serial-mctrl.patch;apply=yes \
-		   file://bugfix-rndis.patch;apply=yes \
-		   file://bugfix-serial-interrupt.patch;apply=yes \
-		   file://bugfix-serial-register-status.patch;apply=yes \
-		   file://mach-types-fix.patch;apply=yes \
-		   file://mmc-version4.patch;apply=yes \
-		   file://kernel-osx.patch;apply=yes \
-		   file://ucb1400-touchscreen.patch;apply=yes \
-		   file://add_input_randomness_export.patch;apply=yes \
-		   file://kobject_get_path_export.patch;apply=yes \
-		   file://ucb1400-ac97-audio.patch;apply=yes \
-		   file://i2c-gpl-module-fix.patch;apply=yes  \
-		   file://disable-uncompress-message.patch;apply=yes \
-		   file://gumstix-mmc.patch;apply=yes \
-		   file://rmk_pxa_mmc_timeout.patch;apply=yes"
+		   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 4f5e847..518e5bb 100644
--- a/recipes/linux/linux-h1940_2.6.11-bk1-h1940.bb
+++ b/recipes/linux/linux-h1940_2.6.11-bk1-h1940.bb
@@ -7,7 +7,7 @@ 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;apply=yes;name=bkpatch \
-           http://rtpnet.nerim.net/ipaq/2.6.11-bk1/2.6.11-bk1-h1940.patch;apply=yes;name=patch \
+           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 d5a3474..1138c8f 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;apply=yes;name=patch1 \
-           http://rtp-net.org/ipaq/patches/2.6.14-3/full.patch;apply=yes;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 e0c74da..1a68781 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;apply=yes;name=patch1 \
-           http://rtp-net.org/ipaq/patches/2.6.17-1/full.patch;apply=yes;name=patch2 \
-           http://rtp-net.org/ipaq/patches/2.6.17-1/WIP/serial_sparse.patch;apply=yes;name=patch3 \
-           http://rtp-net.org/ipaq/patches/2.6.17-1/WIP/h1940_leds.patch;apply=yes;name=patch4 \
-           http://rtp-net.org/ipaq/patches/2.6.17-1/WIP/bluetooth.patch;apply=yes;name=patch5 \
-           http://rtp-net.org/ipaq/patches/2.6.17-1/WIP/h1940_batt.patch;apply=yes;name=patch6 \
-           http://rtp-net.org/ipaq/patches/2.6.17-1/WIP/mtd_partition.patch;apply=yes;name=patch7 \
-           http://anymore.nl/ipaq/usbgadget_fixups.patch;apply=yes;name=patch8 \
-           http://anymore.nl/ipaq/udc_usb_gadget_register_driver_fix.patch;apply=yes;name=patch9 \
-           http://anymore.nl/ipaq/udc_unbind.patch;apply=yes;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 6f07aae..6c23292 100644
--- a/recipes/linux/linux-h6300-omap1_2.6.12-rc5.bb
+++ b/recipes/linux/linux-h6300-omap1_2.6.12-rc5.bb
@@ -4,7 +4,7 @@ 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;apply=yes;name=patch \
-           file://h6300_omap1_2612rc5.patch;apply=yes \
+           file://h6300_omap1_2612rc5.patch \
            file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.12-rc5"
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 bc248b8..b8f9964 100644
--- a/recipes/linux/linux-h6300-omap1_2.6.16.16.bb
+++ b/recipes/linux/linux-h6300-omap1_2.6.16.16.bb
@@ -4,8 +4,8 @@ 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;apply=yes;name=patch \
-           file://linux-2.6.16.16.patch;apply=yes \
-           file://linux-h6300-omap2-2.6.16.16.patch;apply=yes \
+           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 9174461..7c5949e 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;apply=yes \
-           file://hrw-pcmcia-ids-r2.patch;apply=yes \
+           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 bf3fad7..1cb5a86 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;apply=yes \
-           http://www.rpsys.net/openzaurus/patches/archive/export_atags-r0a.patch;apply=yes;name=rppatch35 \
-           file://gcc4x-limits.patch;apply=yes \
-           file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch;apply=yes \
+           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;apply=yes;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 7a59424..d317f1d 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;apply=yes \
-           http://www.rpsys.net/openzaurus/patches/archive/export_atags-r0a.patch;apply=yes;name=patch \
-           file://gcc4x-limits.patch;apply=yes \
-           file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch;apply=yes \
+           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 07a2f51..092f6c1 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;apply=yes \
+	file://twl-asoc-fix-record.diff \
 "
 
 S = "${WORKDIR}/linux-omap-2.6.28.10-igep0020b-0"
diff --git a/recipes/linux/linux-ixp4xx_2.6.27.8.bb b/recipes/linux/linux-ixp4xx_2.6.27.8.bb
index c7e3ede..46abc78 100644
--- a/recipes/linux/linux-ixp4xx_2.6.27.8.bb
+++ b/recipes/linux/linux-ixp4xx_2.6.27.8.bb
@@ -15,7 +15,7 @@ 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;apply=yes;name=stablepatch \
 	   svn://svn.nslu2-linux.org/svnroot/kernel/trunk/patches;module=${VANILLA_VERSION};proto=http \
-	   file://fix-install.patch;apply=yes \
+	   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 dd4cde0..1a8c6d0 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;apply=yes \
+	   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 29a3ab1..8e68e57 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;apply=yes \
-	   file://alsa_hp6xx_2.6.17.patch;apply=yes \
-	   file://rtc-2.6.17.patch;apply=yes \
-	   file://unexpected-int-fix.patch;apply=yes \
-	   file://keymap-fix.patch;apply=yes \
-	   file://io.h-fix.patch;apply=yes \
-	   file://keyboard-fix-deadkeys.patch;apply=yes"
+	   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 8232e62..c8f50d6 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;apply=yes \
-           file://hp6xx-IRQ3.patch;apply=yes \
+           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 150243e..f94b1c9 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;apply=yes \
-	   file://Cpu-Sa1110-Jornada720.patch;apply=yes \
-	   file://Kconfig-Arch-Jornada720.patch;apply=yes \
-	   file://Kconfig-Keyboard-Jornada720.patch;apply=yes \
-	   file://Kconfig-Touchscreen-Jornada720.patch;apply=yes \
-	   file://Kconfig-Video-Jornada720.patch;apply=yes \
-	   file://Mach-Sa1100-Jornada720.patch;apply=yes \
-	   file://Makefile-Keyboard-Jornada720.patch;apply=yes \
-	   file://Makefile-Touchscreen-Jornada720.patch;apply=yes \
-	   file://Makefile-Video-Jornada720.patch;apply=yes \
-	   file://Newfile-Epson1356fb.patch;apply=yes \
-	   file://Newfile-Jornada720_kbd.patch;apply=yes \
-	   file://Newfile-Jornada720_ts.patch;apply=yes"
+	   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 ea62920..40b936d 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;apply=yes"
+	   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 39ae8f9..4078fcb 100644
--- a/recipes/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
+++ b/recipes/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
@@ -8,7 +8,7 @@ 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;apply=yes;name=patch \
-	   file://jornada7xx.patch;apply=yes \
+	   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 12d1dfc..47c2998 100644
--- a/recipes/linux/linux-kirkwood_2.6.29.5.bb
+++ b/recipes/linux/linux-kirkwood_2.6.29.5.bb
@@ -12,9 +12,9 @@ PR_append = "+gitr${SRCREV}"
 
 SRCREV = "70deca35020a5dc3bd3c228bd46852cab77a7f6b"
 SRC_URI = "git://git.marvell.com/orion.git;protocol=git;branch=stable-2.6.29 \
-           file://fw.patch;apply=yes \
-           file://0001--ARM-Kirkwood-CPU-idle-driver.patch;apply=yes \
-           file://0002--ARM-Kirkwood-peripherals-clock-gating-for-power-m.patch;apply=yes \
+           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 b8a9665..5498341 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;apply=yes "
+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 e44bf17..690b214 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;apply=yes \
-                               file://cpuidle-reenable-interrupts.patch;apply=yes \
-                               file://0001-Squashfs-move-zlib-decompression-wrapper-code-into.patch;apply=yes \
-                               file://0002-Squashfs-Factor-out-remaining-zlib-dependencies-int.patch;apply=yes \
-                               file://0003-Squashfs-add-a-decompressor-framework.patch;apply=yes \
-                               file://0004-Squashfs-add-decompressor-entries-for-lzma-and-lzo.patch;apply=yes \
-                               file://0005-Squashfs-add-an-extra-parameter-to-the-decompressor.patch;apply=yes \
-                               file://0006-Squashfs-add-LZMA-compression.patch;apply=yes \
-                               file://0007-Squashfs-Make-unlzma-available-to-non-initramfs-ini.patch;apply=yes \
+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 75fc04c..7cdc600 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;apply=yes \
-	 file://0004-ARM-Kirkwood-OpenRD-SD-UART1-selection.patch;apply=yes \
+	 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;apply=yes \
-	 file://0002-OpenRD-Client-Volari-Z11-driver-added.patch;apply=yes \
-	 file://0003-ARM-Kirkwood-Sound-Sound-driver-added.patch;apply=yes \
-	 file://0004-ARM-Kirkwood-OpenRD-SD-UART1-selection.patch;apply=yes \
+	 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 69decde..cd77560 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;apply=yes \
+	 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;apply=yes \
-	 file://0002-OpenRD-Client-Volari-Z11-driver-added.patch;apply=yes \
-	 file://0003-ARM-Kirkwood-Sound-Sound-driver-added.patch;apply=yes \
-	 file://0004-ARM-Kirkwood-OpenRD-SD-UART1-selection.patch;apply=yes \
+	 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 e5423c4..1f31f2e 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;apply=yes \
-           file://ks8695-base-r0.patch;apply=yes \
+           file://ks8695-headers-r0.patch \
+           file://ks8695-base-r0.patch \
            file://defconfig-ks8695"
 
 S = "${WORKDIR}/linux-${PV}"
diff --git a/recipes/linux/linux-linkstationppc_2.6.28.4.bb b/recipes/linux/linux-linkstationppc_2.6.28.4.bb
index a313e10..3a0c40d 100644
--- a/recipes/linux/linux-linkstationppc_2.6.28.4.bb
+++ b/recipes/linux/linux-linkstationppc_2.6.28.4.bb
@@ -8,7 +8,7 @@ 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;apply=yes;name=patch \
-           file://fw-and-powerpc-install.patch;apply=yes \
+           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 63cfc2d..3295334 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;apply=yes \
-          file://001-magicbox-board-2.6.18.patch;apply=yes \
-          file://002-magicbox-mtd-map-2.6.18.patch;apply=yes \
-          file://010-load-ramdisk-even-if-rootdev-equals-ramdisk.patch;apply=yes \
-          file://magicbox2-ide-cf_2.6.18.patch;apply=yes \
+          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;apply=yes \
-          file://kernel-2.6.18-layer7-2.6.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 b22255e..683defd 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;apply=yes \                      
-          file://002-lzma_decompress.patch;apply=yes \  
-          file://003-squashfs_lzma.patch;apply=yes \  
-          file://004-extra_optimization.patch;apply=yes \
-          file://006-gcc4_inline_fix.patch;apply=yes \
-          file://007-samsung_flash.patch;apply=yes \
-          file://009-revert_intel_flash_breakage.patch;apply=yes \
-          file://010-disable_old_squashfs_compatibility.patch;apply=yes \
-          file://011-mips_boot.patch;apply=yes \ 
-          file://012-mips_cpu_tlb.patch;apply=yes \  
-          file://050-mtdpart_redboot_partition_truncate.patch;apply=yes \  
-          file://060-rootfs_split.patch;apply=yes \
-          file://100-netfilter_layer7_2.8.patch;apply=yes \
-          file://101-netfilter_layer7_pktmatch.patch;apply=yes \  
-          file://110-ipp2p_0.8.1rc1.patch;apply=yes \
-          file://120-openswan-2.4.0.kernel-2.6-natt.patch;apply=yes \
-          file://130-netfilter-ipset.patch;apply=yes \
-          file://140-netfilter_time.patch;apply=yes \
-          file://150-netfilter_imq.patch;apply=yes \        
-          file://160-netfilter_route.patch;apply=yes \
-          file://170-netfilter_chaostables.patch;apply=yes \       
-          file://200-sched_esfq.patch;apply=yes \
-          file://201-multiple_default_gateways.patch;apply=yes \
-          file://202-mips-freestanding.patch;apply=yes \
-          file://204-jffs2_eofdetect.patch;apply=yes \
-          file://207-powerpc_asm_segment_h.patch;apply=yes \
-          file://210-d80211_compat.patch;apply=yes \
-          file://211-no_block2mtd_readahead.patch;apply=yes \
-          file://212-block2mtd_erase_scan.patch;apply=yes \
-          file://510-Yaffs.patch;apply=yes \
-          file://600-x86_lzma.patch;apply=yes \
-          file://700-airprime.patch;apply=yes \
-          file://900-headers_type_and_time.patch;apply=yes \
-          file://901-asm_bitops_include.patch;apply=yes \
-          file://902-darwin_scripts_include.patch;apply=yes \
-          file://903-stddef_include.patch;apply=yes \
-          file://904-ls_time_locale.patch;apply=yes \
-          file://001-magicbox_support.patch;apply=yes \
-          file://002-flash_map.patch;apply=yes \
-          file://100-cf_slot.patch;apply=yes \
+          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 f185cad..a5293eb 100644
--- a/recipes/linux/linux-mainstone_2.6.25.bb
+++ b/recipes/linux/linux-mainstone_2.6.25.bb
@@ -7,8 +7,8 @@ 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;apply=yes;name=patch \
-           file://mainstone-keypad.patch;apply=yes \
-	   file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch;apply=yes \
+           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-mtx-1_2.4.27.bb b/recipes/linux/linux-mtx-1_2.4.27.bb
index ecf80bd..3927520 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;apply=yes \
-	file://02-mtd-mtx-1-map.diff;apply=yes \
-	file://03-mtd-erase-compiler-bug.diff;apply=yes \
-	file://04-mtx-1-board-reset.diff;apply=yes \
-	file://05-mtx-1-pci-irq.diff;apply=yes \
-	file://06-zboot-2.4.26.patch;apply=yes \
-	file://07-zboot-zimage-flash-bin.diff;apply=yes \
-	file://08-usb-nonpci-2.4.24.patch;apply=yes \
-	file://09-au1000-eth-vlan.diff;apply=yes \
-	file://10-iw-max-spy-32.diff;apply=yes \
-	file://11-mtd-proc-partition-rw.diff;apply=yes \
-	file://12-openswan-2.2.0-nat-t.diff;apply=yes \
-	file://13-openswan-2.2.0.patch;apply=yes \
-	file://14-au1000-eth-link-beat.diff;apply=yes \
-	file://16-i2c.patch;apply=yes \
-	file://17-lmsensors.2.8.8.patch;apply=yes \
-	file://18-i2c-au1x00gpio.patch;apply=yes \
-	file://19-kernel-make-depend.diff;apply=yes \
-	file://20-au1x00_ethernet_tx_stats.diff;apply=yes \
-	file://21-mtx-1-watchdog.diff;apply=yes \
-	file://23-mtx-1_watchdog_autotrigger.patch;apply=yes \
-	file://24-mtx-1_sysbtn.patch;apply=yes \
-	file://25-mtx-sio2.diff;apply=yes \
-	file://26-usbd-amd-pb1x00-kit-23may2003-update.diff;apply=yes \
-	file://27-usbd-amd-pb1x00-kit-23may2003-usbd.diff;apply=yes \
-	file://29-au1000-pci-config-clear-errors.diff;apply=yes \
-	file://32-usbserial-stalled-hack.diff;apply=yes \
-	file://33-usbserial-bulk_in_size-4096.diff;apply=yes \
-	file://42-usb-ohci-fixes.patch;apply=yes \
-	file://43-usbserial-27-32-backport.diff;apply=yes \
-	file://45-acm-tty-and-sb2.patch;apply=yes \
-	file://48-pptp.patch;apply=yes \
-	file://49-bash4-configure.patch;apply=yes \
+	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 6236033..70412ab 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;apply=yes \
-	file://28-idsel-cardbus.diff;apply=yes \
-	file://30-mtx-1-sysled.diff;apply=yes \
-	file://31-mtx-1u-led-init.diff;apply=yes \
-	file://32-usbserial-stalled-hack.diff;apply=yes \
-	file://33-usbserial-bulk_in_size-4096.diff;apply=yes \
-	file://39-mppe-mpc.patch;apply=yes \
-	file://40-option-hsdpa.patch;apply=yes"
+	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 a9954fd..90a0dff 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;apply=yes \
-	file://01-mtd-mtx-2.diff;apply=yes \
-	file://03-mtd-erase-compiler-bug.diff;apply=yes \
-	file://04-mtd-yamonenv-readwrite.diff;apply=yes \
-	file://05-mtx-2-pci-irq.diff;apply=yes \
-	file://06-zboot-2.4.26.patch;apply=yes \
-	file://07-zboot-zimage-flash-bin.diff;apply=yes \
-	file://08-usb-nonpci-2.4.24.patch;apply=yes \
-	file://10-iw-max-spy-32.diff;apply=yes \
-	file://11-mtd-proc-partition-rw.diff;apply=yes \
-	file://12-openswan-2.2.0-nat-t.diff;apply=yes \
-	file://13-openswan-2.2.0.patch;apply=yes \
-	file://16-i2c.patch;apply=yes \
-	file://17-lmsensors.2.8.8.patch;apply=yes \
-	file://18-i2c-au1x00gpio.patch;apply=yes \
-	file://19-kernel-make-depend.diff;apply=yes \
-	file://22-umts.diff;apply=yes \
-	file://27-idsel-cardbus.diff;apply=yes \
-	file://28-surfbox2-idsel.diff;apply=yes \
-	file://29-au1000-pci-config-clear-errors.diff;apply=yes \
-	file://32-usbserial-stalled-hack.diff;apply=yes \
-	file://33-usbserial-bulk_in_size-4096.diff;apply=yes \
-	file://35-sb2-slic.patch;apply=yes \
-	file://36-sb2-lcd.patch;apply=yes \
-	file://37-sb2-sysbtn.patch;apply=yes \
-	file://39-mppe-mpc.patch;apply=yes \
-	file://40-option-hsdpa.patch;apply=yes \
-	file://42-usb-ohci-fixes.patch;apply=yes \
-	file://43-usbserial-27-32-backport.diff;apply=yes \
-	file://44-dbdma-and-au1550_psc.diff;apply=yes \
-	file://45-acm-tty-and-sb2.patch;apply=yes \
-	file://46-otg.patch;apply=yes \
-	file://47-au1000_eth.patch;apply=yes \
-	file://48-pptp.patch;apply=yes \
-	file://49-bash4-configure.patch;apply=yes \
+	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 83333d1..772e573 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;apply=yes \
-	file://01-verbose-and-fatal-mkuboot.diff;apply=yes \
+	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 ae3b043..d6751d0 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;apply=yes \
+           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 a056273..14bd10f 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;apply=yes;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 fe81938..2c3c514 100644
--- a/recipes/linux/linux-neuros_2.6.15.bb
+++ b/recipes/linux/linux-neuros_2.6.15.bb
@@ -8,9 +8,9 @@ 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;apply=yes\
+	file://g0-20080113.patch\
 	file://bsp_config.h \
-	file://mtune-gcc4-fix.patch;apply=yes \ 
+	file://mtune-gcc4-fix.patch \ 
 	file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.15"
diff --git a/recipes/linux/linux-nokia800_2.6.18-osso40.bb b/recipes/linux/linux-nokia800_2.6.18-osso40.bb
index f3598af..4a3c3c7 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;apply=yes;name=ossopatch \
-           ${RPSRC}/lzo_kernel-r0.patch;apply=yes;name=rppatch25 \
-           ${RPSRC}/lzo_jffs2-r0.patch;apply=yes;name=rppatch26 \
-           ${RPSRC}/lzo_crypto-r0b.patch;apply=yes;name=rppatch27 \
-           ${RPSRC}/lzo_jffs2_lzomode-r0.patch;apply=yes;name=rppatch28 \
-           ${RPSRC}/lzo_jffs2_sysfs-r0.patch;apply=yes;name=rppatch29 \
-           file://fix_oprofile.patch;apply=yes \
-           file://linux-2.6-limits.patch;apply=yes \
+           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;apply=yes"
+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 a54ff19..cf8afa6 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;apply=yes;name=ossopatch \
-           ${RPSRC}/input_power-r7.patch;apply=yes;name=rppatch24 \
-	   file://suspend-button.patch;apply=yes \
-           file://linux-2.6-limits.patch;apply=yes \
-           file://1300-fix-gcc-4.3-false-modulo-optimization.patch.patch;apply=yes \
+	   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 1bbbbbe..c9f64d9 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
@@ -4,7 +4,7 @@ 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;apply=yes;name=patch \
-           file://schedstats-arm.patch;apply=yes \
+           file://schedstats-arm.patch \
            file://defconfig"
 S = "${WORKDIR}/linux-2.6.9"
 
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 ae5ed65..de75d69 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;apply=yes \
-           file://0006-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch;apply=yes \
-           file://0007-ASoC-enable-audio-capture-by-default-for-twl4030.patch;apply=yes \
-           file://0009-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch;apply=yes \
-           file://dss2/0015-OMAP-DSS-Add-DSS2-support-for-Beagle.patch;apply=yes \
-           file://dss2/0016-video-add-timings-for-hd720.patch;apply=yes \
-           file://holes.patch;apply=yes \
-           file://no-mmc-spew.patch;apply=yes \
-           file://beagleboard/0001-beagleboard-omap3_-foo-_rate_table-omap35x_-foo.patch;apply=yes \
-           file://beagleboard/0001-board-omap3beagle-prepare-for-DM3730-based-Beaglebo.patch;apply=yes \
-           file://0001-board-omap3touchbook-make-it-build-against-TI-linux.patch;apply=yes \
+           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 6525f6a..f5134de 100644
--- a/recipes/linux/linux-omap-pm_2.6.28.bb
+++ b/recipes/linux/linux-omap-pm_2.6.28.bb
@@ -14,40 +14,40 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.g
 	   file://defconfig"
 
 SRC_URI_append = " \
-           file://fixup-evm-cpufreq.diff;apply=yes \
-           file://no-empty-flash-warnings.patch;apply=yes \
-           file://no-cortex-deadlock.patch;apply=yes \
-           file://read_die_ids.patch;apply=yes \
-           file://fix-install.patch;apply=yes \
+           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;apply=yes \
-           file://mru-fix-display-panning.diff;apply=yes \
-           file://mru-improve-pixclock-config.diff;apply=yes \
-           file://mru-make-video-timings-selectable.diff;apply=yes \
-           file://mru-enable-overlay-optimalization.diff;apply=yes \
-           file://dvb-fix-dma.diff;apply=yes \
-           file://0001-Removed-resolution-check-that-prevents-scaling-when.patch;apply=yes \
-           file://0001-Implement-downsampling-with-debugs.patch;apply=yes \
-           file://twl-asoc-fix-record.diff;apply=yes \
-           file://tick-schedc-suppress-needless-timer-reprogramming.patch;apply=yes \
-           file://0001-DSS-New-display-subsystem-driver-for-OMAP2-3.patch;apply=yes \
-           file://0002-DSS-OMAPFB-fb-driver-for-new-display-subsystem.patch;apply=yes \
-           file://0003-DSS-Add-generic-DVI-panel.patch;apply=yes \
-           file://0004-DSS-support-for-Beagle-Board.patch;apply=yes \
-           file://0005-DSS-Sharp-LS037V7DW01-LCD-Panel-driver.patch;apply=yes \
-           file://0007-DSS-Support-for-OMAP3-EVM-board.patch;apply=yes \
-           file://0008-DSS-Hacked-N810-support.patch;apply=yes \
-           file://0009-DSS-OMAPFB-allocate-fbmem-only-for-fb0-or-if-spes.patch;apply=yes \
-           file://0010-DSS-OMAPFB-remove-extra-omapfb_setup_overlay-call.patch;apply=yes \
-           file://0011-DSS-OMAPFB-fix-GFX_SYNC-to-be-compatible-with-DSS1.patch;apply=yes \
-           file://0014-DSS-fix-clk_get_usecount.patch;apply=yes \
-           file://0001-ASoC-Add-support-for-OMAP3-EVM.patch;apply=yes \
-           file://0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch;apply=yes \
-           file://dss2.diff;apply=yes \
-           file://register-all-OPPs.diff;apply=yes \
-           file://add-cpufreq-for-omap3evm.diff;apply=yes \
-           file://usbttyfix.patch;apply=yes \
-           file://0124-leds-gpio-broken-with-current-git.patch;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 \
 "
 
 
@@ -55,7 +55,7 @@ SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
 			     "
 
 SRC_URI_append_omap3evm = " \
-	file://evm-mcspi-ts.diff;apply=yes \
+	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 8b9a6f3..a309e88 100644
--- a/recipes/linux/linux-omap-pm_2.6.29.bb
+++ b/recipes/linux/linux-omap-pm_2.6.29.bb
@@ -14,193 +14,193 @@ 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;apply=yes \
-           file://no-cortex-deadlock.patch;apply=yes \
-           file://read_die_ids.patch;apply=yes \
-           file://fix-install.patch;apply=yes \
-           file://0124-leds-gpio-broken-with-current-git.patch;apply=yes \
-           file://ehci.patch;apply=yes \
-           file://dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch;apply=yes \
-           file://dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch;apply=yes \
-           file://dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch;apply=yes \
-           file://dss2/0004-DSS2-OMAP-framebuffer-driver.patch;apply=yes \
-           file://dss2/0005-DSS2-Add-panel-drivers.patch;apply=yes \
-           file://dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch;apply=yes \
-           file://dss2/0007-DSS2-Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch;apply=yes \
-           file://dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch;apply=yes \
-           file://dss2/0009-DSS2-Add-acx565akm-panel.patch;apply=yes \
-           file://dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch;apply=yes \
-           file://dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch;apply=yes \
-           file://dss2/0012-DSS2-Fix-DMA-rotation.patch;apply=yes \
-           file://dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch;apply=yes \
-           file://dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch;apply=yes \
-           file://dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch;apply=yes \
-           file://dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch;apply=yes \
-           file://dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch;apply=yes \
-           file://dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch;apply=yes \
-           file://dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch;apply=yes \
-           file://dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch;apply=yes \
-           file://dss2/0021-DSS2-Add-venc-register-dump.patch;apply=yes \
-           file://dss2/0022-DSS2-FB-remove-unused-var-warning.patch;apply=yes \
-           file://dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch;apply=yes \
-           file://dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch;apply=yes \
-           file://dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch;apply=yes \
-           file://dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch;apply=yes \
-           file://dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch;apply=yes \
-           file://dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch;apply=yes \
-           file://dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch;apply=yes \
-           file://dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch;apply=yes \
-           file://dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch;apply=yes \
-           file://dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch;apply=yes \
-           file://dss2/0033-DSS2-Prefer-3-tap-filter.patch;apply=yes \
-           file://dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch;apply=yes \
-           file://dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch;apply=yes \
-           file://dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch;apply=yes \
-           file://dss2/0037-DSS2-Added-support-for-querying-color-keying.patch;apply=yes \
-           file://dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch;apply=yes \
-           file://dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch;apply=yes \
-           file://dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch;apply=yes \
-           file://dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch;apply=yes \
-           file://dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch;apply=yes \
-           file://dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch;apply=yes \
-           file://dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch;apply=yes \
-           file://dss2/0045-DSS2-Fixed-line-endings-from-to.patch;apply=yes \
-           file://dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch;apply=yes \
-           file://dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch;apply=yes \
-           file://dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch;apply=yes \
-           file://dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch;apply=yes \
-           file://dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch;apply=yes \
-           file://dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch;apply=yes \
-           file://dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch;apply=yes \
-           file://dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch;apply=yes \
-           file://dss2/0054-DSS2-DSI-more-error-handling.patch;apply=yes \
-           file://dss2/0055-DSS2-Added-global-alpha-support.patch;apply=yes \
-           file://dss2/0056-DSS2-Rotation-attrs-for-YUV-need-not-to-be-reversed.patch;apply=yes \
-           file://dss2/0057-DSS2-Documentation-update-for-new-sysfs-entries-in.patch;apply=yes \
-           file://dss2/0058-DSS2-Don-t-touch-plane-coordinates-when-changing-fb.patch;apply=yes \
-           file://dss2/0059-DSS2-DSI-configure-ENTER-EXIT_HS_MODE_LATENCY.patch;apply=yes \
-           file://dss2/0060-DSS2-Avoid-div-by-zero-when-calculating-required-fc.patch;apply=yes \
-           file://dss2/0061-DSS2-VRFB-save-restore-context.patch;apply=yes \
-           file://dss2/0062-DSS2-VRAM-Fix-indentation.patch;apply=yes \
-           file://dss2/0063-DSS2-fix-the-usage-of-get_last_off_on_transaction_i.patch;apply=yes \
-           file://dss2/0064-VRFB-fix-debug-messages.patch;apply=yes \
-           file://dss2/0065-VRFB-add-suspend-resume-functionality.patch;apply=yes \
-           file://dss2/0066-DSS2-DSI-tune-the-timings-to-be-more-relaxed.patch;apply=yes \
-           file://dss2/0067-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch;apply=yes \
-           file://dss2/0068-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch;apply=yes \
-           file://dss2/0069-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch;apply=yes \
-           file://dss2/0070-DSS2-fix-irq1.diff;apply=yes \
-           file://dss2/0071-DSS2-fix-irq2.diff;apply=yes \
-           file://dss2/merge-fixups.diff;apply=yes \
-           file://overo-cpufreq.diff;apply=yes \
-           file://register-all-OPPs.diff;apply=yes \
-           file://isp/v4l/0001-V4L2-Add-COLORFX-user-control.patch;apply=yes \
-           file://isp/v4l/0002-V4L-Int-if-v4l2_int_device_try_attach_all-requires.patch;apply=yes \
-           file://isp/v4l/0003-V4L-Int-if-Dummy-slave.patch;apply=yes \
-           file://isp/v4l/0004-V4L-int-device-add-support-for-VIDIOC_QUERYMENU.patch;apply=yes \
-           file://isp/v4l/0005-V4L-Int-if-Add-vidioc_int_querycap.patch;apply=yes \
-           file://isp/iommu/0001-omap-iommu-tlb-and-pagetable-primitives.patch;apply=yes \
-           file://isp/iommu/0002-omap-iommu-omap2-architecture-specific-functions.patch;apply=yes \
-           file://isp/iommu/0003-omap-iommu-omap3-iommu-device-registration.patch;apply=yes \
-           file://isp/iommu/0004-omap-iommu-simple-virtual-address-space-management.patch;apply=yes \
-           file://isp/iommu/0005-omap-iommu-entries-for-Kconfig-and-Makefile.patch;apply=yes \
-           file://isp/iommu/0006-omap-iommu-Don-t-try-BUG_ON-in_interrupt.patch;apply=yes \
-           file://isp/iommu/0007-omap-iommu-We-support-chained-scatterlists-probabl.patch;apply=yes \
-           file://isp/iommu/0008-omap2-iommu-entries-for-Kconfig-and-Makefile.patch;apply=yes \
-           file://isp/omap3camera/0001-omap3isp-Add-ISP-main-driver-and-register-definitio.patch;apply=yes \
-           file://isp/omap3camera/0002-omap3isp-Add-ISP-MMU-wrapper.patch;apply=yes \
-           file://isp/omap3camera/0003-omap3isp-Add-userspace-header.patch;apply=yes \
-           file://isp/omap3camera/0004-omap3isp-Add-ISP-frontend-CCDC.patch;apply=yes \
-           file://isp/omap3camera/0005-omap3isp-Add-ISP-backend-PRV-and-RSZ.patch;apply=yes \
-           file://isp/omap3camera/0006-omap3isp-Add-statistics-collection-modules-H3A-and.patch;apply=yes \
-           file://isp/omap3camera/0007-omap3isp-Add-CSI2-interface-support.patch;apply=yes \
-           file://isp/omap3camera/0008-omap3isp-Add-ISP-tables.patch;apply=yes \
-           file://isp/omap3camera/0009-omap34xxcam-Add-camera-driver.patch;apply=yes \
-           file://isp/resizer/0023-OMAP-Resizer-Basic-Resizer-refreshed-with-latest-gi.patch;apply=yes \
-           file://isp/resizer/0024-OMAP3-Resizer-V4L2-buf-layer-issues-fixed.patch;apply=yes \
-           file://isp/resizer/0025-OMAP3-Resizer-Build-issues-fixed.patch;apply=yes \
-           file://modedb-hd720.patch;apply=yes \
-           file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;apply=yes \
-           file://vfp/02-vfp-ptrace.patch;apply=yes \
-           file://vfp/03-vfp-corruption.patch;apply=yes \
-           file://vfp/04-vfp-threads.patch;apply=yes \
-           file://vfp/05-vfp-signal-handlers.patch;apply=yes \
-           file://arch-has-holes.diff;apply=yes \
-           file://musb/0001-USB-musb-only-turn-off-vbus-in-OTG-hosts.patch;apply=yes \
-           file://musb/0002-USB-composite-avoid-inconsistent-lock-state.patch;apply=yes \
-           file://musb/0003-USB-musb-NAK-timeout-scheme-on-bulk-RX-endpoint.patch;apply=yes \
-           file://musb/0004-USB-musb-rewrite-host-periodic-endpoint-allocation.patch;apply=yes \
-           file://musb/0005-USB-TWL-disable-VUSB-regulators-when-cable-unplugg.patch;apply=yes \
-           file://musb/0006-USB-gadget-composite-device-level-suspend-resume-h.patch;apply=yes \
-           file://musb/0007-usb-gadget-fix-ethernet-link-reports-to-ethtool.patch;apply=yes \
-           file://musb/0008-usb-musb_host-minor-enqueue-locking-fix-v2.patch;apply=yes \
-           file://musb/0009-usb-musb_host-fix-ep0-fifo-flushing.patch;apply=yes \
-           file://musb/0010-musb-sanitize-clearing-TXCSR-DMA-bits-take-2.patch;apply=yes \
-           file://musb/0011-musb-fix-isochronous-TXDMA-take-2.patch;apply=yes \
-           file://musb/0012-musb-fix-possible-panic-while-resuming.patch;apply=yes \
-           file://musb/0013-musb_host-refactor-musb_save_toggle-take-2.patch;apply=yes \
-           file://musb/0014-musb_gadget-suppress-parasitic-TX-interrupts-with.patch;apply=yes \
-           file://musb/0015-musb_gadget-fix-unhandled-endpoint-0-IRQs.patch;apply=yes \
-           file://musb/0016-musb_host-factor-out-musb_ep_-get-set-_qh.patch;apply=yes \
-           file://musb/0017-musb_host-refactor-URB-giveback.patch;apply=yes \
-           file://musb/0018-musb-split-out-CPPI-interrupt-handler.patch;apply=yes \
-           file://musb/0019-musb_host-simplify-check-for-active-URB.patch;apply=yes \
-           file://musb/0020-musb_host-streamline-musb_cleanup_urb-calls.patch;apply=yes \
-           file://musb/0021-twl4030-usb-fix-minor-reporting-goofage.patch;apply=yes \
-           file://musb/0022-musb-use-dma-mode-1-for-TX-if-transfer-size-equals.patch;apply=yes \
-           file://musb/0023-musb-add-high-bandwidth-ISO-support.patch;apply=yes \
-           file://musb/0024-USB-otg-adding-nop-usb-transceiver.patch;apply=yes \
-           file://musb/0025-nop-usb-xceiv-behave-when-linked-as-a-module.patch;apply=yes \
-           file://musb/0026-musb-proper-hookup-to-transceiver-drivers.patch;apply=yes \
-           file://musb/0027-musb-otg-timer-cleanup.patch;apply=yes \
-           file://musb/0028-musb-make-initial-HNP-roleswitch-work-v2.patch;apply=yes \
-           file://musb/0029-musb-support-disconnect-after-HNP-roleswitch.patch;apply=yes \
-           file://cache/l1cache-shift.patch;apply=yes \
-           file://cache/copy-page-tweak.patch;apply=yes \
+           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;apply=yes \
-                               file://tincantools-zippy.diff;apply=yes \
+                               file://tincantools-puppy.diff \
+                               file://tincantools-zippy.diff \
 "
 
 SRC_URI_append_omap3-touchbook = " file://logo_linux_clut224.ppm \
-                                           file://../beagleboard/beagle-asoc.patch;apply=yes \
-           file://accelerometer-mma7455l.patch;apply=yes \
-           file://accelerometer-touchscreen-mux-spi.patch;apply=yes \
-           file://touchscreen-ads7846-export-settings.patch;apply=yes \
-           file://touchscreen-ads7846-rotation-fixed.patch;apply=yes \
-           file://dspbridge.patch;apply=yes \
-           file://battery2-bq27200-no-error-message.patch;apply=yes \
-           file://sound-headphone-detection.patch;apply=yes \
-           file://dss2-fix-XY-coordinates-when-rotating.patch;apply=yes \
-           file://battery1-tps65950-charging-management-1.patch;apply=yes \
-           file://dss2-fix-scaling-when-rotating.patch;apply=yes \
-           file://dss2-export-status.patch;apply=yes \
-           file://usb-otg-pc-connection.patch;apply=yes \
-           file://battery1-tps65950-charging-management-2.patch;apply=yes \
-           file://battery1-tps65950-charging-management-3.patch;apply=yes \
-           file://memory-move-malloc-end.patch;apply=yes \
-           file://aufs-1.patch;apply=yes \
-           file://aufs-2.patch;apply=yes \
-           file://aufs-3.patch;apply=yes \
-           file://aufs-squashfs-mount-to-avoid-initramfs.patch;apply=yes \
-           file://screen-backlight-accessible-by-user.patch;apply=yes \
-           file://dss2-blank-rotate-accessible-by-user.patch;apply=yes \
-           file://boot-no-power-message.patch;apply=yes \
-           file://usb-lower-current-consumption-upon-insertion.patch;apply=yes \
-           file://battery2-bq27200-gpio-charged.patch;apply=yes \
-           file://keyboard-special-keys.patch;apply=yes \
-           file://dss2-fix-rotation-offsets.patch;apply=yes \
-           file://touchbook-config.patch;apply=yes \
+                                           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;apply=yes \
-           file://touchbook-sound.diff;apply=yes \
+#           file://boot-trace-for-optimization.patch \
+           file://touchbook-sound.diff \
 "
 
 SRC_URI_append_omap3evm = " \
-	file://evm-mcspi-ts.diff;apply=yes \
+	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 e581a47..28689dc 100644
--- a/recipes/linux/linux-omap-pm_git.bb
+++ b/recipes/linux/linux-omap-pm_git.bb
@@ -17,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;apply=yes \
-           file://no-cortex-deadlock.patch;apply=yes \
-           file://read_die_ids.patch;apply=yes \
-           file://fix-install.patch;apply=yes \
-           file://fix-musb-oops.diff;apply=yes \
-           file://fix-mtd.diff;apply=yes \
-           file://ehci.patch;apply=yes \
-           file://dss2/0001-OMAPFB-move-omapfb.h-to-include-linux.patch;apply=yes \
-           file://dss2/0002-DSS2-OMAP2-3-Display-Subsystem-driver.patch;apply=yes \
-           file://dss2/0003-DSS2-OMAP-framebuffer-driver.patch;apply=yes \
-           file://dss2/0004-DSS2-Add-panel-drivers.patch;apply=yes \
-           file://dss2/0005-DSS2-HACK-Add-DSS2-support-for-N800.patch;apply=yes \
-           file://dss2/0006-DSS2-Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch;apply=yes \
-           file://dss2/0007-DSS2-Add-function-to-display-object-to-get-the-back.patch;apply=yes \
-           file://dss2/0008-DSS2-Add-acx565akm-panel.patch;apply=yes \
-           file://dss2/0009-DSS2-Small-VRFB-context-allocation-bug-fixed.patch;apply=yes \
-           file://dss2/0010-DSS2-Allocated-memory-for-Color-Look-up-table.patch;apply=yes \
-           file://dss2/0011-DSS2-Fix-DMA-rotation.patch;apply=yes \
-           file://dss2/0012-DSS2-Verify-that-overlay-paddr-0.patch;apply=yes \
-           file://dss2/0013-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch;apply=yes \
-           file://dss2/0014-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch;apply=yes \
-           file://dss2/0015-DSS2-DSI-improve-packet-len-calculation.patch;apply=yes \
-           file://dss2/0016-DSS2-Disable-video-planes-on-sync-lost-error.patch;apply=yes \
-           file://dss2/0017-DSS2-check-for-ovl-paddr-only-when-enabling.patch;apply=yes \
-           file://dss2/0018-DSS2-Check-fclk-limits-when-configuring-video-plane.patch;apply=yes \
-           file://dss2/0019-DSS2-Check-scaling-limits-against-proper-values.patch;apply=yes \
-           file://dss2/0020-DSS2-Add-venc-register-dump.patch;apply=yes \
-           file://dss2/0021-DSS2-FB-remove-unused-var-warning.patch;apply=yes \
-           file://dss2/0022-DSS2-pass-the-default-FB-color-format-through-board.patch;apply=yes \
-           file://dss2/0023-DSS2-Beagle-Use-gpio_set_value.patch;apply=yes \
-           file://dss2/0024-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch;apply=yes \
-           file://dss2/0025-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch;apply=yes \
-           file://dss2/0026-DSS2-VRFB-rotation-and-mirroring-implemented.patch;apply=yes \
-           file://dss2/0027-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch;apply=yes \
-           file://dss2/0028-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch;apply=yes \
-           file://dss2/0029-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch;apply=yes \
-           file://dss2/0030-DSS2-do-bootmem-reserve-for-exclusive-access.patch;apply=yes \
-           file://dss2/0031-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch;apply=yes \
-           file://dss2/0032-DSS2-Prefer-3-tap-filter.patch;apply=yes \
-           file://dss2/0033-DSS2-VRAM-improve-omap_vram_add_region.patch;apply=yes \
-           file://dss2/0034-DSS2-Added-the-function-pointer-for-getting-default.patch;apply=yes \
-           file://dss2/0035-DSS2-Added-support-for-setting-and-querying-alpha-b.patch;apply=yes \
-           file://dss2/0036-DSS2-Added-support-for-querying-color-keying.patch;apply=yes \
-           file://dss2/0037-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch;apply=yes \
-           file://dss2/0038-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch;apply=yes \
-           file://dss2/0039-DSS2-Provided-proper-exclusion-for-destination-colo.patch;apply=yes \
-           file://dss2/0040-DSS2-Disable-vertical-offset-with-fieldmode.patch;apply=yes \
-           file://dss2/0041-DSS2-Don-t-enable-fieldmode-automatically.patch;apply=yes \
-           file://dss2/0042-DSS2-Swap-field-0-and-field-1-registers.patch;apply=yes \
-           file://dss2/0043-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch;apply=yes \
-           file://dss2/0044-DSS2-Fixed-line-endings-from-to.patch;apply=yes \
-           file://dss2/0045-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch;apply=yes \
-           file://dss2/0046-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch;apply=yes \
-           file://dss2/0047-DSS2-VRAM-clear-allocated-area-with-DMA.patch;apply=yes \
-           file://dss2/0048-DSS2-OMAPFB-remove-fb-clearing-code.patch;apply=yes \
-           file://dss2/0049-DSS2-VRAM-use-debugfs-not-procfs.patch;apply=yes \
-           file://dss2/0050-DSS2-VRAM-fix-section-mismatch-warning.patch;apply=yes \
-           file://dss2/0051-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch;apply=yes \
-           file://dss2/0052-DSS2-DSI-more-error-handling.patch;apply=yes \
-           file://dss2/0053-DSS2-Added-global-alpha-support.patch;apply=yes \
-           file://dss2/0054-DSS2-Rotation-attrs-for-YUV-need-not-to-be-reversed.patch;apply=yes \
-           file://dss2/0055-DSS2-Documentation-update-for-new-sysfs-entries-in.patch;apply=yes \
-           file://dss2/0056-DSS2-Don-t-touch-plane-coordinates-when-changing-fb.patch;apply=yes \
-           file://dss2/0057-DSS2-DSI-configure-ENTER-EXIT_HS_MODE_LATENCY.patch;apply=yes \
-           file://dss2/0058-DSS2-Avoid-div-by-zero-when-calculating-required-fc.patch;apply=yes \
-           file://dss2/0059-DSS2-VRFB-save-restore-context.patch;apply=yes \
-           file://dss2/0060-DSS2-VRAM-Fix-indentation.patch;apply=yes \
-           file://dss2/0061-DSS2-fix-the-usage-of-get_last_off_on_transaction_i.patch;apply=yes \
-           file://dss2/0062-VRFB-fix-debug-messages.patch;apply=yes \
-           file://dss2/0063-VRFB-add-suspend-resume-functionality.patch;apply=yes \
-           file://dss2/0064-DSS2-DSI-tune-the-timings-to-be-more-relaxed.patch;apply=yes \
-           file://dss2/0065-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch;apply=yes \
-           file://dss2/0066-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch;apply=yes \
-           file://dss2/0067-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch;apply=yes \
-           file://dss2/0068-DSS2-DSI-Improve-perf-measurement-output.patch;apply=yes \
-           file://dss2/0069-DSS2-DSI-Add-support-for-external-TE-signal.patch;apply=yes \
-           file://dss2/0070-DSS2-DSI-Fix-LP-clock.patch;apply=yes \
-           file://dss2/0071-DSS2-Do-not-swap-xres-yres-or-change-rotation-in-ch.patch;apply=yes \
-           file://dss2/0072-DSS2-Allow-independent-rotation-for-each-plane.patch;apply=yes \
-           file://dss2/0073-DSS2-DISPC-fix-irq-handling-locking.patch;apply=yes \
-           file://dss2/0074-DSS2-DISPC-clear-irqstatus-for-newly-enabled-irqs.patch;apply=yes \
-           file://dss2/0075-DSS2-Add-WSS-support.patch;apply=yes \
-           file://dss2/0076-DSS2-Fix-PAL-NTSC-timings.patch;apply=yes \
-           file://dss2/0077-DSS2-Add-venc-debugfs-file.patch;apply=yes \
-           file://dss2/0078-DSS2-Enable-replication-logic-feature.patch;apply=yes \
-           file://dss2/0079-DSS2-support-for-querying-the-supported-overlay-col.patch;apply=yes \
-           file://dss2/0080-DSS2-fix-uninitialized-var-in-OMAPFB_GET_CAPS-IOCTL.patch;apply=yes \
-           file://dss2/0081-DSS2-Reset-WSS-data-only-when-changing-TV-standard.patch;apply=yes \
-           file://dss2/0082-DSS2-DSI-implement-timeout-for-DSI-transfer.patch;apply=yes \
-           file://dss2/0083-DSS2-DSI-reset-perf-frame-counter-when-starting-au.patch;apply=yes \
-           file://dss2/0084-DSS2-DSI-Implement-DSI-bus-lock.patch;apply=yes \
-           file://dss2/0085-DSS2-OMAPFB-omapfb_get_ovl_colormode-to-static.patch;apply=yes \
-           file://dss2/0086-DSS2-VRFB-make-vrfb_hw_context-static.patch;apply=yes \
-           file://dss2/0087-DSS2-new-device-driver-model.patch;apply=yes \
-           file://dss2/0088-DSS2-Board-file-changes-for-new-device-model.patch;apply=yes \
-           file://dss2/0089-DSS2-Panel-driver-changes-for-new-device-model.patch;apply=yes \
-           file://dss2/0090-DSS2-VENC-venc-uses-regulator-framework.patch;apply=yes \
-           file://dss2/0091-DSS2-DSI-Use-regulator-framework.patch;apply=yes \
-           file://dss2/0092-DSS2-SDP-regulators-for-VDAC-DSI.patch;apply=yes \
-           file://dss2/0093-DSS2-Sharp-panel-use-regulator-fw.patch;apply=yes \
-           file://dss2/0094-DSS2-Beagle-regulators-for-VDAC-DSI.patch;apply=yes \
-           file://dss2/0095-DSS2-Fix-checkpatch-complaints.patch;apply=yes \
-           file://dss2/0096-DSS2-Overo-add-vdac-dsi-regulators-fix-panel-name.patch;apply=yes \
-           file://dss2/0097-DSS2-implement-overlay_manager_info.patch;apply=yes \
-           file://dss2/0098-DSS2-use-sysfs_streq-to-compare-display-names.patch;apply=yes \
-           file://dss2/0099-DSS2-Implement-function-to-verify-lcd-timings.patch;apply=yes \
-           file://dss2/0100-DSS2-Remove-non-existing-dsi-power-funcs-from-dss.h.patch;apply=yes \
-           file://dss2/0101-DSS2-move-to_dss_driver-and-to_dss_device-to-pu.patch;apply=yes \
-           file://dss2/0102-DSS2-CLK-change-omapfb-omapdss-in-clock-framewo.patch;apply=yes \
-           file://dss2/0103-DSS2-Use-clkdev.patch;apply=yes \
-           file://dss2/0104-DSS2-Fix-documentation.patch;apply=yes \
-           file://dss2/0105-DSS2-OMAPFB-first-set-TE-then-update-mode.patch;apply=yes \
-           file://dss2/0106-DSS2-OMAPFB-Disable-forced-display-update-on-fb-cl.patch;apply=yes \
-           file://dss2/0107-DSS2-DSI-use-INIT_COMPLETION-not-init_completion.patch;apply=yes \
-           file://dss2/0108-DSS2-DSI-Rewrite-of-the-DSI-update-and-cmd-queue.patch;apply=yes \
-           file://dss2/0109-DSS2-let-init_display-return-an-error-code.patch;apply=yes \
-           file://dss2/0110-DSS2-isolate-the-SDI-pads-when-SDI-is-disabled.patch;apply=yes \
-           file://dss2/0111-DSS2-Fix-bottom-field-initial-starting-line.patch;apply=yes \
-           file://dss2/0112-DSS2-Correctly-determine-if-an-interlaced-display-i.patch;apply=yes \
-           file://dss2/0113-DSS2-Fix-omapfb-framebuffer-name.patch;apply=yes \
-           file://dss2/0114-DSS2-Overo-update-defconfig-to-lighter-one.patch;apply=yes \
-           file://dss2/0115-DSS2-SDI-make-sdi_pads-static.patch;apply=yes \
-           file://dss2/0116-DSS2-Fix-default_color-sysfs-output.patch;apply=yes \
-           file://dss2/0117-DSS2-Locking-for-VRFB.patch;apply=yes \
-           file://dss2/0118-DSS2-DISPC-fix-locking-issue-with-irq-handling.patch;apply=yes \
-           file://dss2/0119-DSS2-OMAPFB-remove-unneeded-locks.patch;apply=yes \
-           file://dss2/0120-DSS2-DISPC-configuration-management.patch;apply=yes \
-           file://dss2/0121-DSS2-VRFB-clean-up-BUG-calls.patch;apply=yes \
-           file://dss2/0122-DSS2-OMAPFB-don-t-fail-even-if-default-display-doe.patch;apply=yes \
-           file://dss2/0123-DSS2-DSI-Fix-external-TE-wait.patch;apply=yes \
-           file://dss2/0124-DSS2-DSI-Increase-framedone-timeout-to-1s.patch;apply=yes \
-           file://dss2/0125-DSS2-VRAM-Add-function-to-get-free-vram-info.patch;apply=yes \
-           file://dss2/0126-DSS2-OMAPFB-implement-OMAPFB_GET_VRAM_INFO-ioctl.patch;apply=yes \
-           file://dss2/0127-DSS2-DSI-increase-dsi-thread-priority.patch;apply=yes \
-           file://dss2/0128-DSS2-DSI-check-bus_lock-in-send_bta.patch;apply=yes \
-           file://dss2/0129-DSS2-DSI-export-dsi_vc_send_bta_sync.patch;apply=yes \
-           file://dss2/0130-DSS2-DSI-clear-BTA-irq-before-enabling-it.patch;apply=yes \
-           file://dss2/0131-DSS2-DSI-check-dsi_set_te-return-value.patch;apply=yes \
-           file://dss2/0132-DSS2-DSI-use-only-1-VC.-Fixes-to-TE.patch;apply=yes \
-           file://dss2/0133-DSS2-VRAM-Remove-unused-defines.patch;apply=yes \
-           file://dss2/0134-DSS2-VENC-Add-invert_polarity-flag.patch;apply=yes \
-           file://dss2/0135-DSS2-VRAM-Add-defines-for-VRAM-types.patch;apply=yes \
-           file://dss2/0136-DSS2-VRAM-separate-VRAM-setup-from-the-old-fb-vram.patch;apply=yes \
-           file://dss2/0137-DSS2-VRFB-Update-license-information.patch;apply=yes \
-           file://dss2/0138-DSS2-VRAM-Update-license-information.patch;apply=yes \
-           file://dss2/0139-DSS2-VRFB-use-pr_-instead-of-printk.patch;apply=yes \
-           file://dss2/0140-DSS2-VRAM-Change-CONFIG_OMAP2_DSS_VRAM_SIZE-name.patch;apply=yes \
-           file://dss2/0141-DSS2-VRAM-add-CONFIG_OMAP2_VRAM-flag.patch;apply=yes \
-           file://dss2/0142-DSS2-VRFB-Add-CONFIG_OMAP2_VRFB-flag.patch;apply=yes \
-           file://dss2/0143-DSS2-VRFB-VRAM-fix-checkpatch-warnings.patch;apply=yes \
-           file://dss2/0144-DSS2-fixes-to-dss_omap_3430sdp_defconfig-to-make-it.patch;apply=yes \
-           file://dss2/0145-DSS2-BEAGLE-get-DSS2-working-again-on-beagle.patch;apply=yes \
-           file://dss2/0146-DSS2-change-include-asm-.-to-linux-.-in-oma.patch;apply=yes \
+           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;apply=yes \
+           file://beagle-writable-uboot.diff \
 			     "
 
 SRC_URI_append_omap3evm = " \
-	file://evm-mcspi-ts.diff;apply=yes \
+	file://evm-mcspi-ts.diff \
 "
 
 S = "${WORKDIR}/git"
diff --git a/recipes/linux/linux-omap-psp_2.6.29.bb b/recipes/linux/linux-omap-psp_2.6.29.bb
index eaf04fa..7422372 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;apply=yes \
+           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;apply=yes \
-        file://shiva-ehci.diff;apply=yes \
+        file://shiva-bits.diff \
+        file://shiva-ehci.diff \
 "
 
 SRC_URI_append_omap3evm = " \
-	file://fix-twl-merge-damage.diff;apply=yes \
-	file://fix-section-mismatch.diff;apply=yes \
-	file://no-3517-hack.diff;apply=yes \
+	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 97f43eb..5c1fb6e 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;apply=yes \
+           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 1f8d87a..f2351a3 100644
--- a/recipes/linux/linux-omap-psp_2.6.32.bb
+++ b/recipes/linux/linux-omap-psp_2.6.32.bb
@@ -12,73 +12,73 @@ SRCREV = "627293ad28604b22612f9a4a318f64cfab241e22"
 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-Revert-omap3-beagle-Fix-compile-time-errors.patch;apply=yes \
-           file://0002-board-omap3touchbook-make-it-build-against-TI-linux-.patch;apply=yes \
-           file://0003-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board-f.patch;apply=yes \
-           file://0004-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch;apply=yes \
-           file://0005-board-omap3-beagle-add-DSS2-support.patch;apply=yes \
-           file://0006-board-omap3beagle-prepare-for-DM3730-based-Beagleboa.patch;apply=yes \
-           file://0007-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch;apply=yes \
-           file://0008-ARM-OMAP-beagleboard-pre-export-GPIOs-to-userspace-w.patch;apply=yes \
-           file://0009-ARM-OMAP-beagleboard-initialize-ds1307-and-eeprom-on.patch;apply=yes \
-           file://0010-ARM-OMAP-update-beagleboard-defconfig.patch;apply=yes \
-           file://0011-ASoC-enable-audio-capture-by-default-for-twl4030.patch;apply=yes \
-           file://0012-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch;apply=yes \
-           file://0013-OMAP3630-DSS2-Enable-Pre-Multiplied-Alpha-Support.patch;apply=yes \
-           file://0014-DSS2-add-bootarg-for-selecting-svideo-or-composite-f.patch;apply=yes \
-           file://0015-ISP-add-some-more-from-Leopard-imaging-patch.patch;apply=yes \
-           file://0016-ARM-OMAP-Overo-Add-support-for-second-ethernet-port.patch;apply=yes \
-           file://0017-drivers-net-smsc911x-return-ENODEV-if-device-is-not-.patch;apply=yes \
-           file://0018-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch;apply=yes \
-           file://0019-drivers-mfd-add-twl4030-madc-driver.patch;apply=yes \
-           file://0020-ARM-OMAP-Add-missing-twl4030-madc-header-file.patch;apply=yes \
-           file://0021-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch;apply=yes \
-           file://0022-ARM-OMAP-Add-twl4030-madc-support-to-Beagle.patch;apply=yes \
-           file://0023-netdev-rt73usb-add-vendor-device-ID-for-Ceiva-Wirele.patch;apply=yes \
-           file://0024-mmc-don-t-display-single-block-read-console-messages.patch;apply=yes \
-           file://0025-ARM-OMAP2-mmc-twl4030-move-clock-input-selection-pri.patch;apply=yes \
-           file://0026-board-overo-add-PM-code-and-sync-with-http-www.sakom.patch;apply=yes \
-           file://0027-twl4030-madc-adjust-for-twl4030-twl-api-changes.patch;apply=yes \
-           file://0028-OMAP-DSS2-Re-add-support-for-Samsung-lte430wq-f0c-pa.patch;apply=yes \
-           file://0029-OMAP-DSS2-Add-support-for-LG-Philips-LB035Q02-panel.patch;apply=yes \
-           file://0030-Fix-for-bus-width-which-improves-SD-card-s-peformanc.patch;apply=yes \
-           file://0031-ARM-VFP-add-support-to-sync-the-VFP-state-of-the-cur.patch;apply=yes \
-           file://0032-ARM-VFP-preserve-the-HW-context-when-calling-signal-.patch;apply=yes \
-           file://0033-Switch-SGX-clocks-to-200MHz-on-DM37xx-OMAP36xx.patch;apply=yes \
-           file://0034-modedb.c-add-proper-720p60-mode.patch;apply=yes \
-           file://0035-RTC-add-support-for-backup-battery-recharge.patch;apply=yes \
-           file://0036-ARM-Add-prompt-for-CONFIG_ALIGNMENT_TRAP.patch;apply=yes \
-           file://0037-ARM-Print-warning-on-alignment-trap-in-kernel-mode.patch;apply=yes \
-           file://0038-ARM-Expose-some-CPU-control-registers-via-sysfs.patch;apply=yes \
-           file://0039-ARM-Add-option-to-allow-userspace-PLE-access.patch;apply=yes \
-           file://0040-ARM-Add-option-to-allow-userspace-access-to-performa.patch;apply=yes \
-           file://0041-ARM-Expose-some-PMON-registers-through-sysfs.patch;apply=yes \
-           file://0042-musb-allow-host-io-without-gadget-module.patch;apply=yes \
-           file://0043-MTD-silence-ecc-errors-on-mtdblock0.patch;apply=yes \
-           file://0044-ARM-OMAP-beagle-every-known-beagle-except-revB-uses-.patch;apply=yes \
+           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;apply=yes \
-                                  file://0002-MMA7455L-accelerometer-driver.patch;apply=yes \
-                                  file://0003-bq27x00_battery-remove-error-message-output.patch;apply=yes \
-                                  file://0004-bq27x00_battery-add-charged-gpio.patch;apply=yes \
-                                  file://0005-adf7846-add-more-debugging.patch;apply=yes \
-                                  file://0006-ads7846-read-max-mix-x-y-from-pdata.patch;apply=yes \
-                                  file://0007-ads7846-add-settling-delay-to-pdata.patch;apply=yes \
-                                  file://0008-DSS2-OMAPFB-Translate-X-Y-coordinates-for-the-video-.patch;apply=yes \
-                                  file://0009-DSS2-Fix-scaling-checks-when-rotation-is-90-or-270-d.patch;apply=yes \
-                                  file://0010-add-touchbook-hid-driver.patch;apply=yes \
-                                  file://0011-Make-backlight-controls-accessible-to-users.patch;apply=yes \
-                                  file://0012-ads7846-don-t-error-out-when-there-s-no-pendown-gpio.patch;apply=yes \
-                                  file://0013-ASoC-add-driver-for-omap3-touchbook.patch;apply=yes \
-                                  file://0014-backlight-add-PWM-support.patch;apply=yes \
-                                  file://0015-Forward-port-TWL4030-BCI-driver-from-2.6.29-to-2.6.3.patch;apply=yes \
-                                  file://0016-ARM-OMAP-omap3-touchbook-update-boardfile.patch;apply=yes \
-#                                 file://0017-ARM-OMAP-add-800MHz-OPP-and-remove-125MHz-one.patch;apply=yes \
+                                  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.bb b/recipes/linux/linux-omap-zoomsync_2.6.32.bb
index 89c4012..2ac81ef 100644
--- a/recipes/linux/linux-omap-zoomsync_2.6.32.bb
+++ b/recipes/linux/linux-omap-zoomsync_2.6.32.bb
@@ -25,14 +25,14 @@ PR_append = "+gitr${SRCREV}"
 
 
 SRC_URI_omapzoom2 = "git://dev.omapzoom.org/pub/scm/integration/kernel-omap3.git;branch=master;protocol=git \
-       file://0042-musb-allow-host-io-without-gadget-module.patch;apply=yes \
-       file://rev.patch;apply=yes \
+       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://0042-musb-allow-host-io-without-gadget-module.patch;apply=yes \
-       file://rev.patch;apply=yes \
+       file://0042-musb-allow-host-io-without-gadget-module.patch \
+       file://rev.patch \
        file://logo_linux_clut224.ppm \
        file://defconfig"
 
diff --git a/recipes/linux/linux-omap1_2.6.18+git.bb b/recipes/linux/linux-omap1_2.6.18+git.bb
index bf8fe26..b01b48d 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;apply=yes \
+           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 bcb20b9..5e24577 100644
--- a/recipes/linux/linux-omap1_2.6.18-omap1.bb
+++ b/recipes/linux/linux-omap1_2.6.18-omap1.bb
@@ -4,7 +4,7 @@ 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;apply=yes;name=patch \
-           file://another-ide-cs-ids.patch;apply=yes \
+           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 3ffd90b..9d1b475 100644
--- a/recipes/linux/linux-omap1_2.6.19-omap1.bb
+++ b/recipes/linux/linux-omap1_2.6.19-omap1.bb
@@ -4,8 +4,8 @@ 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;apply=yes;name=patch \
-           file://another-ide-cs-ids.patch;apply=yes \
-           file://i2c-fix.patch;apply=yes \
+           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.23-omap1.bb b/recipes/linux/linux-omap1_2.6.23-omap1.bb
index 1e2c45b..24d9e38 100644
--- a/recipes/linux/linux-omap1_2.6.23-omap1.bb
+++ b/recipes/linux/linux-omap1_2.6.23-omap1.bb
@@ -4,7 +4,7 @@ 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;apply=yes;name=patch \
-           file://binutils-buildid-arm.patch;apply=yes \
+           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 17c9f02..4c3dc8a 100644
--- a/recipes/linux/linux-omap1_2.6.24-omap1.bb
+++ b/recipes/linux/linux-omap1_2.6.24-omap1.bb
@@ -4,8 +4,8 @@ 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;apply=yes;name=patch \
-           file://binutils-buildid-arm.patch;apply=yes \
-           file://timespec_add_ns_avoid_udivdi3.patch;apply=yes \
+           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 0d583fe..060ff5c 100644
--- a/recipes/linux/linux-omap1_2.6.25-omap1.bb
+++ b/recipes/linux/linux-omap1_2.6.25-omap1.bb
@@ -4,7 +4,7 @@ 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;apply=yes;name=patch \
-	   file://gcc43-arm-fix-inline-asm-constraints-for-preload.patch;apply=yes \
+	   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 fbcdc72..cb427e3 100644
--- a/recipes/linux/linux-omap2_git.bb
+++ b/recipes/linux/linux-omap2_git.bb
@@ -11,32 +11,32 @@ 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;apply=yes \
-           file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;apply=yes \
-	   file://0001-omap3-cpuidle.patch;apply=yes \ 
-           file://0002-omap3-cpuidle.patch;apply=yes \
-           file://timer-suppression.patch;apply=yes \
-           file://ASoC-TWL4030-codec-driver.patch;apply=yes \
-           file://ASoC-machine-driver-for-OMAP3-EVM.patch;apply=yes \
-           file://ASoC-machine-driver-for_OMAP3-Beagle.patch;apply=yes \
-           file://16bpp.patch;apply=yes \
-           file://no-empty-flash-warnings.patch;apply=yes \
+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;apply=yes \
-           file://01-fix-timing-print.diff;apply=yes \
-           file://03-enable-overlay-opt.diff;apply=yes \
-           file://04-use-pcd.diff;apply=yes \
-           file://05-fix-display-panning.diff;apply=yes \
-           file://06-ensure-fclk.diff;apply=yes \
-           file://07-set-burst-size.diff;apply=yes \
-           file://cache-display-fix.patch;apply=yes \
-           file://mru-clocks1.diff;apply=yes \
-           file://mru-clocks2.diff;apply=yes \
-           file://mru-clocks3.diff;apply=yes \	
-           file://4bitmmc.diff;apply=yes \
-           file://no-cortex-deadlock.patch;apply=yes \
+           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;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 \
@@ -51,18 +51,18 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;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;apply=yes \
-           file://musb-dmafix.patch;apply=yes \ 
+           file://01-beagle-cpufreq.diff \
+           file://musb-dmafix.patch \ 
 "
 
-SRC_URI_append_omap3evm = " file://no-harry-potter.diff;apply=yes \
-           file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;apply=yes \
-           file://0001-omap3-cpuidle.patch;apply=yes \
-           file://0002-omap3-cpuidle.patch;apply=yes \
-           file://timer-suppression.patch;apply=yes \
-           file://soc.patch;apply=yes \
-           file://no-empty-flash-warnings.patch;apply=yes \
-           file://touchscreen.patch;apply=yes \
+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 c2ebf14..0c8dcd9 100644
--- a/recipes/linux/linux-omap_2.6.26.bb
+++ b/recipes/linux/linux-omap_2.6.26.bb
@@ -8,32 +8,32 @@ 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;apply=yes \
-           file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;apply=yes \
-	   file://0001-omap3-cpuidle.patch;apply=yes \ 
-           file://0002-omap3-cpuidle.patch;apply=yes \
-           file://timer-suppression.patch;apply=yes \
-           file://ASoC-TWL4030-codec-driver.patch;apply=yes \
-           file://ASoC-machine-driver-for-OMAP3-EVM.patch;apply=yes \
-           file://ASoC-machine-driver-for_OMAP3-Beagle.patch;apply=yes \
-           file://16bpp.patch;apply=yes \
-           file://no-empty-flash-warnings.patch;apply=yes \
+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;apply=yes \
-           file://01-fix-timing-print.diff;apply=yes \
-           file://03-enable-overlay-opt.diff;apply=yes \
-           file://04-use-pcd.diff;apply=yes \
-           file://05-fix-display-panning.diff;apply=yes \
-           file://06-ensure-fclk.diff;apply=yes \
-           file://07-set-burst-size.diff;apply=yes \
-           file://cache-display-fix.patch;apply=yes \
-           file://mru-clocks1.diff;apply=yes \
-           file://mru-clocks2.diff;apply=yes \
-           file://mru-clocks3.diff;apply=yes \	
-           file://4bitmmc.diff;apply=yes \
-           file://no-cortex-deadlock.patch;apply=yes \
+           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;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 \
@@ -48,18 +48,18 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;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;apply=yes \
-           file://musb-dmafix.patch;apply=yes \ 
+           file://01-beagle-cpufreq.diff \
+           file://musb-dmafix.patch \ 
 "
 
-SRC_URI_append_omap3evm = " file://no-harry-potter.diff;apply=yes \
-           file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;apply=yes \
-           file://0001-omap3-cpuidle.patch;apply=yes \
-           file://0002-omap3-cpuidle.patch;apply=yes \
-           file://timer-suppression.patch;apply=yes \
-           file://soc.patch;apply=yes \
-           file://no-empty-flash-warnings.patch;apply=yes \
-           file://touchscreen.patch;apply=yes \
+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 1a6bc48..fdf0fdd 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;apply=yes \
-           file://oprofile-0.9.3.armv7.diff;apply=yes \
-           file://no-cortex-deadlock.patch;apply=yes \
-           file://read_die_ids.patch;apply=yes \
-           file://fix-install.patch;apply=yes \
+           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;apply=yes \
-           file://mru-fix-display-panning.diff;apply=yes \
-           file://mru-make-dpll4-m4-ck-programmable.diff;apply=yes \
-           file://mru-add-clk-get-parent.diff;apply=yes \
-           file://mru-improve-pixclock-config.diff;apply=yes \
-           file://mru-make-video-timings-selectable.diff;apply=yes \
-           file://mru-enable-overlay-optimalization.diff;apply=yes \
-           file://musb-fix-ISO-in-unlink.diff;apply=yes \
-           file://musb-fix-multiple-bulk-transfers.diff;apply=yes \
-           file://musb-fix-endpoints.diff;apply=yes \
-           file://dvb-fix-dma.diff;apply=yes \
-           file://0001-Removed-resolution-check-that-prevents-scaling-when.patch;apply=yes \
-           file://0001-Implement-downsampling-with-debugs.patch;apply=yes \
-#           file://openvz/0001-arm-introduce-MAP_EXECPRIO-define.patch;apply=yes \
-#           file://openvz/0002-arm-export-arm-version-of-show_mem.patch;apply=yes \
-#           file://openvz/0003-arm-wire-OpenVZ-syscalls.patch;apply=yes \
-#           file://openvz/0004-arm-add-openvz-and-bc-Kconfigs.patch;apply=yes \
-#           file://openvz/openvz-2.6.27.diff;apply=yes \
-           file://sitecomwl168-support.diff;apply=yes \
-           file://nand.patch;apply=yes \
-           file://musb-rxtx.patch;apply=yes \
-           file://add-gwc.diff;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;apply=yes \
+	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 d4e7031..622a38d 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;apply=yes \
-           file://no-cortex-deadlock.patch;apply=yes \
-           file://read_die_ids.patch;apply=yes \
-           file://fix-install.patch;apply=yes \
+           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;apply=yes \
-           file://mru-fix-display-panning.diff;apply=yes \
-           file://mru-improve-pixclock-config.diff;apply=yes \
-           file://mru-make-video-timings-selectable.diff;apply=yes \
-           file://mru-enable-overlay-optimalization.diff;apply=yes \
-           file://dvb-fix-dma.diff;apply=yes \
-           file://0001-Removed-resolution-check-that-prevents-scaling-when.patch;apply=yes \
-           file://0001-Implement-downsampling-with-debugs.patch;apply=yes \
-           file://twl-asoc-fix-record.diff;apply=yes \
-           file://tick-schedc-suppress-needless-timer-reprogramming.patch;apply=yes \
-           file://0001-DSS-New-display-subsystem-driver-for-OMAP2-3.patch;apply=yes \
-           file://0002-DSS-OMAPFB-fb-driver-for-new-display-subsystem.patch;apply=yes \
-           file://0003-DSS-Add-generic-DVI-panel.patch;apply=yes \
-           file://0004-DSS-support-for-Beagle-Board.patch;apply=yes \
-           file://0005-DSS-Sharp-LS037V7DW01-LCD-Panel-driver.patch;apply=yes \
-           file://0006-DSS-Support-for-OMAP3-SDP-board.patch;apply=yes \
-           file://0007-DSS-Support-for-OMAP3-EVM-board.patch;apply=yes \
-           file://0008-DSS-Hacked-N810-support.patch;apply=yes \
-           file://0009-DSS-OMAPFB-allocate-fbmem-only-for-fb0-or-if-spes.patch;apply=yes \
-           file://0010-DSS-OMAPFB-remove-extra-omapfb_setup_overlay-call.patch;apply=yes \
-           file://0011-DSS-OMAPFB-fix-GFX_SYNC-to-be-compatible-with-DSS1.patch;apply=yes \
-           file://0012-DSS-Add-comments-to-FAKE_VSYNC-to-make-things-more.patch;apply=yes \
-           file://0013-DSS-OMAPFB-remove-extra-spaces.patch;apply=yes \
-           file://0014-DSS-fix-clk_get_usecount.patch;apply=yes \
-           file://0001-ASoC-Add-support-for-OMAP3-EVM.patch;apply=yes \
-           file://0001-board-omap3beagle-set-i2c-3-to-100kHz.patch;apply=yes \
-           file://add-resizer-driver.patch;apply=yes \
-           file://usbttyfix.patch;apply=yes \
-           file://ioremap-fix.patch;apply=yes \
-           file://0124-leds-gpio-broken-with-current-git.patch;apply=yes \
-           file://mmctiming.patch;apply=yes \
-           file://modedb-hd720.patch;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;apply=yes \
+           file://0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch \
 			     "
 
 SRC_URI_append_omap3evm = " \
-	file://evm-mcspi-ts.diff;apply=yes \
+	file://evm-mcspi-ts.diff \
 "
 
 SRC_URI_append_overo = " \
-	file://overo-ehci.patch;apply=yes \
+	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 86c889e..a87fb25 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;apply=yes \
-           file://no-cortex-deadlock.patch;apply=yes \
-           file://read_die_ids.patch;apply=yes \
-           file://fix-install.patch;apply=yes \
-           file://dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch;apply=yes \
-           file://dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch;apply=yes \
-           file://dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch;apply=yes \
-           file://dss2/0004-DSS2-OMAP-framebuffer-driver.patch;apply=yes \
-           file://dss2/0005-DSS2-Add-panel-drivers.patch;apply=yes \
-           file://dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch;apply=yes \
-           file://dss2/0007-DSS2-Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch;apply=yes \
-           file://dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch;apply=yes \
-           file://dss2/0009-DSS2-Add-acx565akm-panel.patch;apply=yes \
-           file://dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch;apply=yes \
-           file://dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch;apply=yes \
-           file://dss2/0012-DSS2-Fix-DMA-rotation.patch;apply=yes \
-           file://dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch;apply=yes \
-           file://dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch;apply=yes \
-           file://dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch;apply=yes \
-           file://dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch;apply=yes \
-           file://dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch;apply=yes \
-           file://dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch;apply=yes \
-           file://dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch;apply=yes \
-           file://dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch;apply=yes \
-           file://dss2/0021-DSS2-Add-venc-register-dump.patch;apply=yes \
-           file://dss2/0022-DSS2-FB-remove-unused-var-warning.patch;apply=yes \
-           file://dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch;apply=yes \
-           file://dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch;apply=yes \
-           file://dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch;apply=yes \
-           file://dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch;apply=yes \
-           file://dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch;apply=yes \
-           file://dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch;apply=yes \
-           file://dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch;apply=yes \
-           file://dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch;apply=yes \
-           file://dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch;apply=yes \
-           file://dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch;apply=yes \
-           file://dss2/0033-DSS2-Prefer-3-tap-filter.patch;apply=yes \
-           file://dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch;apply=yes \
-           file://dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch;apply=yes \
-           file://dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch;apply=yes \
-           file://dss2/0037-DSS2-Added-support-for-querying-color-keying.patch;apply=yes \
-           file://dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch;apply=yes \
-           file://dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch;apply=yes \
-           file://dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch;apply=yes \
-           file://dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch;apply=yes \
-           file://dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch;apply=yes \
-           file://dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch;apply=yes \
-           file://dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch;apply=yes \
-           file://dss2/0045-DSS2-Fixed-line-endings-from-to.patch;apply=yes \
-           file://dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch;apply=yes \
-           file://dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch;apply=yes \
-           file://dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch;apply=yes \
-           file://dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch;apply=yes \
-           file://dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch;apply=yes \
-           file://dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch;apply=yes \
-           file://dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch;apply=yes \
-           file://dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch;apply=yes \
-           file://dss2/0054-DSS2-DSI-more-error-handling.patch;apply=yes \
-           file://dss2/0055-DSS2-Added-global-alpha-support.patch;apply=yes \
-           file://dss2/0056-DSS2-Rotation-attrs-for-YUV-need-not-to-be-reversed.patch;apply=yes \
-           file://dss2/0057-DSS2-Documentation-update-for-new-sysfs-entries-in.patch;apply=yes \
-           file://dss2/0058-DSS2-Don-t-touch-plane-coordinates-when-changing-fb.patch;apply=yes \
-           file://dss2/0059-DSS2-DSI-configure-ENTER-EXIT_HS_MODE_LATENCY.patch;apply=yes \
-           file://dss2/0060-DSS2-Avoid-div-by-zero-when-calculating-required-fc.patch;apply=yes \
-           file://dss2/0061-DSS2-VRFB-save-restore-context.patch;apply=yes \
-           file://dss2/0062-DSS2-VRAM-Fix-indentation.patch;apply=yes \
-           file://dss2/0063-DSS2-fix-the-usage-of-get_last_off_on_transaction_i.patch;apply=yes \
-           file://dss2/0064-VRFB-fix-debug-messages.patch;apply=yes \
-           file://dss2/0065-VRFB-add-suspend-resume-functionality.patch;apply=yes \
-           file://dss2/0066-DSS2-DSI-tune-the-timings-to-be-more-relaxed.patch;apply=yes \
-           file://dss2/0067-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch;apply=yes \
-           file://dss2/0068-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch;apply=yes \
-           file://dss2/0069-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch;apply=yes \
-           file://dss2/0070-DSS2-fix-irq1.diff;apply=yes \
-           file://dss2/0071-DSS2-fix-irq2.diff;apply=yes \
-           file://0001-board-ldp-add-regulator-info-to-get-the-microSD-slo.patch;apply=yes \
-           file://fix-unaligned-access.diff;apply=yes \
-           file://make-alignment-visible.diff;apply=yes \
-           file://mmctiming.patch;apply=yes \
-           file://ehci.patch;apply=yes \
-           file://fix-audio-capture.patch;apply=yes \
-           file://ads7846-detection.patch;apply=yes \
-           file://musb/0001-USB-musb-only-turn-off-vbus-in-OTG-hosts.patch;apply=yes \
-           file://musb/0002-USB-composite-avoid-inconsistent-lock-state.patch;apply=yes \
-           file://musb/0003-USB-musb-NAK-timeout-scheme-on-bulk-RX-endpoint.patch;apply=yes \
-           file://musb/0004-USB-musb-rewrite-host-periodic-endpoint-allocation.patch;apply=yes \
-           file://musb/0005-USB-TWL-disable-VUSB-regulators-when-cable-unplugg.patch;apply=yes \
-           file://musb/0006-USB-gadget-composite-device-level-suspend-resume-h.patch;apply=yes \
-           file://musb/0007-usb-gadget-fix-ethernet-link-reports-to-ethtool.patch;apply=yes \
-           file://musb/0008-usb-musb_host-minor-enqueue-locking-fix-v2.patch;apply=yes \
-           file://musb/0009-usb-musb_host-fix-ep0-fifo-flushing.patch;apply=yes \
-           file://musb/0010-musb-sanitize-clearing-TXCSR-DMA-bits-take-2.patch;apply=yes \
-           file://musb/0011-musb-fix-isochronous-TXDMA-take-2.patch;apply=yes \
-           file://musb/0012-musb-fix-possible-panic-while-resuming.patch;apply=yes \
-           file://musb/0013-musb_host-refactor-musb_save_toggle-take-2.patch;apply=yes \
-           file://musb/0014-musb_gadget-suppress-parasitic-TX-interrupts-with.patch;apply=yes \
-           file://musb/0015-musb_gadget-fix-unhandled-endpoint-0-IRQs.patch;apply=yes \
-           file://musb/0016-musb_host-factor-out-musb_ep_-get-set-_qh.patch;apply=yes \
-           file://musb/0017-musb_host-refactor-URB-giveback.patch;apply=yes \
-           file://musb/0018-musb-split-out-CPPI-interrupt-handler.patch;apply=yes \
-           file://musb/0019-musb_host-simplify-check-for-active-URB.patch;apply=yes \
-           file://musb/0020-musb_host-streamline-musb_cleanup_urb-calls.patch;apply=yes \
-           file://musb/0021-twl4030-usb-fix-minor-reporting-goofage.patch;apply=yes \
-           file://musb/0022-musb-use-dma-mode-1-for-TX-if-transfer-size-equals.patch;apply=yes \
-           file://musb/0023-musb-add-high-bandwidth-ISO-support.patch;apply=yes \
-           file://musb/0024-USB-otg-adding-nop-usb-transceiver.patch;apply=yes \
-           file://musb/0025-nop-usb-xceiv-behave-when-linked-as-a-module.patch;apply=yes \
-           file://musb/0026-musb-proper-hookup-to-transceiver-drivers.patch;apply=yes \
-           file://musb/0027-musb-otg-timer-cleanup.patch;apply=yes \
-           file://musb/0028-musb-make-initial-HNP-roleswitch-work-v2.patch;apply=yes \
-           file://musb/0029-musb-support-disconnect-after-HNP-roleswitch.patch;apply=yes \
-           file://musb/0030-musb-fifo.patch;apply=yes \
-           file://isp/v4l/0001-V4L2-Add-COLORFX-user-control.patch;apply=yes \
-           file://isp/v4l/0002-V4L-Int-if-v4l2_int_device_try_attach_all-requires.patch;apply=yes \
-           file://isp/v4l/0003-V4L-Int-if-Dummy-slave.patch;apply=yes \
-           file://isp/v4l/0004-V4L-int-device-add-support-for-VIDIOC_QUERYMENU.patch;apply=yes \
-           file://isp/v4l/0005-V4L-Int-if-Add-vidioc_int_querycap.patch;apply=yes \
-           file://isp/iommu/0001-omap-iommu-tlb-and-pagetable-primitives.patch;apply=yes \
-           file://isp/iommu/0002-omap-iommu-omap2-architecture-specific-functions.patch;apply=yes \
-           file://isp/iommu/0003-omap-iommu-omap3-iommu-device-registration.patch;apply=yes \
-           file://isp/iommu/0004-omap-iommu-simple-virtual-address-space-management.patch;apply=yes \
-           file://isp/iommu/0005-omap-iommu-entries-for-Kconfig-and-Makefile.patch;apply=yes \
-           file://isp/iommu/0006-omap-iommu-Don-t-try-BUG_ON-in_interrupt.patch;apply=yes \
-           file://isp/iommu/0007-omap-iommu-We-support-chained-scatterlists-probabl.patch;apply=yes \
-           file://isp/iommu/0008-omap2-iommu-entries-for-Kconfig-and-Makefile.patch;apply=yes \
-           file://isp/omap3camera/0001-omap3isp-Add-ISP-main-driver-and-register-definitio.patch;apply=yes \
-           file://isp/omap3camera/0002-omap3isp-Add-ISP-MMU-wrapper.patch;apply=yes \
-           file://isp/omap3camera/0003-omap3isp-Add-userspace-header.patch;apply=yes \
-           file://isp/omap3camera/0004-omap3isp-Add-ISP-frontend-CCDC.patch;apply=yes \
-           file://isp/omap3camera/0005-omap3isp-Add-ISP-backend-PRV-and-RSZ.patch;apply=yes \
-           file://isp/omap3camera/0006-omap3isp-Add-statistics-collection-modules-H3A-and.patch;apply=yes \
-           file://isp/omap3camera/0007-omap3isp-Add-CSI2-interface-support.patch;apply=yes \
-           file://isp/omap3camera/0008-omap3isp-Add-ISP-tables.patch;apply=yes \
-           file://isp/omap3camera/0009-omap34xxcam-Add-camera-driver.patch;apply=yes \
-           file://isp/resizer/0023-OMAP-Resizer-Basic-Resizer-refreshed-with-latest-gi.patch;apply=yes \
-           file://isp/resizer/0024-OMAP3-Resizer-V4L2-buf-layer-issues-fixed.patch;apply=yes \
-           file://isp/resizer/0025-OMAP3-Resizer-Build-issues-fixed.patch;apply=yes \
-           file://0124-leds-gpio-broken-with-current-git.patch;apply=yes \
-           file://modedb-hd720.patch;apply=yes \
-           file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;apply=yes \
-           file://vfp/02-vfp-ptrace.patch;apply=yes \
-           file://vfp/03-vfp-corruption.patch;apply=yes \
-           file://vfp/04-vfp-threads.patch;apply=yes \
-           file://vfp/05-vfp-signal-handlers.patch;apply=yes \
-           file://arch-has-holes.diff;apply=yes \
-           file://cache/l1cache-shift.patch;apply=yes \
-           file://cache/copy-page-tweak.patch;apply=yes \
-           file://2.6.29_relocation_1.patch;apply=yes \
-           file://2.6.29_relocation_2.patch;apply=yes \
-           file://smsc/smsc911x-1.patch;apply=yes \
-           file://smsc/smsc911x-2.patch;apply=yes \
-           file://smsc/smsc911x-3.patch;apply=yes \
-           file://smsc/smsc911x-4.patch;apply=yes \
+           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;apply=yes \
-                               file://tincantools-puppy.diff;apply=yes \
-                               file://tincantools-zippy.diff;apply=yes \
-			       file://beaglebug/beaglebug-full.patch;apply=yes \
+			                   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;apply=yes \
-           file://accelerometer-mma7455l.patch;apply=yes \
-           file://accelerometer-touchscreen-mux-spi.patch;apply=yes \
-           file://touchscreen-ads7846-export-settings.patch;apply=yes \
-           file://touchscreen-ads7846-rotation-support.patch;apply=yes \
-           file://dspbridge.patch;apply=yes \
-           file://battery2-bq27200-no-error-message.patch;apply=yes \
-           file://sound-headphone-detection.patch;apply=yes \
-           file://dss2-fix-XY-coordinates-when-rotating.patch;apply=yes \
-           file://battery1-tps65950-charging-management-1.patch;apply=yes \
-           file://dss2-fix-scaling-when-rotating.patch;apply=yes \
-           file://dss2-export-status.patch;apply=yes \
-           file://usb-otg-pc-connection.patch;apply=yes \
-           file://battery1-tps65950-charging-management-2.patch;apply=yes \
-           file://memory-move-malloc-end.patch;apply=yes \
-           file://aufs-1.patch;apply=yes \
-           file://aufs-2.patch;apply=yes \
-           file://aufs-3.patch;apply=yes \
-           file://aufs-squashfs-mount-to-avoid-initramfs.patch;apply=yes \
-           file://screen-backlight-accessible-by-user.patch;apply=yes \
-           file://dss2-blank-rotate-accessible-by-user.patch;apply=yes \
-           file://boot-no-power-message.patch;apply=yes \
-           file://usb-lower-current-consumption-upon-insertion.patch;apply=yes \
-           file://battery2-bq27200-gpio-charged.patch;apply=yes \
-           file://keyboard-special-keys.patch;apply=yes \
-           file://dss2-fix-rotation-offsets.patch;apply=yes \
-           file://touchbook-config.patch;apply=yes \
+			                   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;apply=yes \
+#           file://boot-trace-for-optimization.patch \
 "
 
 SRC_URI_append_omap3evm = " \
-	file://evm-mcspi-ts.diff;apply=yes \
+	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 c15c7f6..2fc2add 100644
--- a/recipes/linux/linux-omap_2.6.31.bb
+++ b/recipes/linux/linux-omap_2.6.31.bb
@@ -19,46 +19,46 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.g
 	   file://defconfig"
 
 SRC_URI_append = " \
-                  file://ehci.patch;apply=yes \
-                  file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;apply=yes \
-                  file://cache/l1cache-shift.patch;apply=yes \
-                  file://cache/copy-page-tweak.patch;apply=yes \
-                  file://dss2/0001-OMAP2-Add-funcs-for-writing-SMS_ROT_-registers.patch;apply=yes \
-                  file://dss2/0002-OMAP-OMAPFB-split-omapfb.h.patch;apply=yes \
-                  file://dss2/0003-OMAP-OMAPFB-add-omapdss-device.patch;apply=yes \
-                  file://dss2/0004-OMAP-Add-VRAM-manager.patch;apply=yes \
-                  file://dss2/0005-OMAP-Add-support-for-VRFB-rotation-engine.patch;apply=yes \
-                  file://dss2/0006-OMAP-DSS2-Documentation-for-DSS2.patch;apply=yes \
-                  file://dss2/0007-OMAP-DSS2-Display-Subsystem-Driver-core.patch;apply=yes \
-                  file://dss2/0008-OMAP-DSS2-Add-more-core-files.patch;apply=yes \
-                  file://dss2/0009-OMAP-DSS2-DISPC.patch;apply=yes \
-                  file://dss2/0010-OMAP-DSS2-DPI-driver.patch;apply=yes \
-                  file://dss2/0011-OMAP-DSS2-Video-encoder-driver.patch;apply=yes \
-                  file://dss2/0012-OMAP-DSS2-RFBI-driver.patch;apply=yes \
-                  file://dss2/0013-OMAP-DSS2-SDI-driver.patch;apply=yes \
-                  file://dss2/0014-OMAP-DSS2-DSI-driver.patch;apply=yes \
-                  file://dss2/0015-OMAP-DSS2-omapfb-driver.patch;apply=yes \
-                  file://dss2/0016-OMAP-DSS2-Add-DPI-panel-drivers.patch;apply=yes \
-                  file://dss2/0017-OMAP-DSS2-Taal-DSI-command-mode-panel-driver.patch;apply=yes \
-                  file://dss2/0001-OMAP3-Enable-DSS2-for-OMAP3EVM-board.patch;apply=yes \
-                  file://dss2/0002-V4L2-Added-New-V4L2-CIDs-for-omap-devices-V4L2-IOCT.patch;apply=yes \
-                  file://dss2/0003-V4L2-Updated-v4l2_common-for-new-V4L2-CIDs.patch;apply=yes \
-                  file://dss2/0004-OMAP2-3-V4L2-Add-support-for-OMAP2-3-V4L2-driver-on.patch;apply=yes \
-                  file://expansion-boards/tincantools-zippy.patch;apply=yes \
-                  file://madc/madc-driver.patch;apply=yes \
-                  file://madc/madc.patch;apply=yes \
-                  file://arch-has-holes.diff;apply=yes \
-                  file://usb/0001-musb-fix-put_device-call-sequence.patch;apply=yes \
-                  file://usb/0008-omap3-Add-CHIP_GE_OMAP3430ES3-for-HSUSB.patch;apply=yes \
-                  file://usb/0011-musb-fix-musb-gadget_driver-NULL-bug.patch;apply=yes \
-                  file://usb/0012-musb-Add-back-old-musb-procfs-file.patch;apply=yes \
-                  file://usb/0013-musb-Remove-USB_SUSPEND-auto-select-with-OTG.patch;apply=yes \
-                  file://usb/0014-musb-disable-PING-on-status-phase-of-control-transf.patch;apply=yes \
-                  file://usb/0015-musb-Add-context-save-and-restore-support.patch;apply=yes \
-                  file://usb/0016-usb-update-defconfig.patch;apply=yes \
-                  file://usb/0001-ARM-OMAP-Fix-beagleboard-EHCI-setup.patch;apply=yes \
-                  file://modedb-hd720.patch;apply=yes \
-                  file://dss2/beagle-dss2-support.patch;apply=yes \
+                  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 f33a3b1..348ec96 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;apply=yes \
-file://usb/ehci-omap.c-mach-to-plat.diff;apply=yes \
-file://cm-t35/0001-omap3-cm-t35-add-mux-initialization.patch;apply=yes \
-file://cm-t35/0001-OMAP-DSS2-add-Toppoly-TDO35S-panel.patch;apply=yes \
-file://cm-t35/0002-omap3-cm-t35-add-DSS2-display-support.patch;apply=yes \
-file://cm-t35/0003-omap3-cm-t35-update-defconfig-for-DSS2.patch;apply=yes \
-file://cm-t35/0004-omap3-cm-t35-add-cm-t35-mux-configs.patch;apply=yes \
-file://cm-t35/0006-omap3-cm-t35-update-defconfig.patch;apply=yes \
-file://cm-t35/0001-backlight-tdo24m-ensure-chip-select-changes-between-.patch;apply=yes \
-file://0001-ARM-OMAP-Overo-Add-support-for-second-ethernet-po.patch;apply=yes \
-file://0003-drivers-net-smsc911x-return-ENODEV-if-device-is-n.patch;apply=yes \
-file://0004-drivers-input-touchscreen-ads7846-return-ENODEV.patch;apply=yes \
-file://0005-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board.patch;apply=yes \
-file://0006-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch;apply=yes \
-file://0007-ASoC-enable-audio-capture-by-default-for-twl4030.patch;apply=yes \
-file://0009-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch;apply=yes \
-file://madc/0009-drivers-mfd-add-twl4030-madc-driver.patch;apply=yes \
-file://madc/0010-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch;apply=yes \
-file://madc/0011-ARM-OMAP-Add-twl4030-madc-support-to-Beagle.patch;apply=yes \
-file://madc/0013-ARM-OMAP-Add-missing-twl4030-madc-header-file.patch;apply=yes \
-file://dss2/0012-OMAP-DSS2-Add-support-for-LG-Philips-LB035Q02-pane.patch;apply=yes \
-file://dss2/0014-OMAP-DSS-Add-DSS2-support-for-Overo.patch;apply=yes \
-file://dss2/0015-OMAP-DSS-Add-DSS2-support-for-Beagle.patch;apply=yes \
-file://dss2/0016-video-add-timings-for-hd720.patch;apply=yes \
-file://holes.patch;apply=yes \
+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 1e65e3f..e74e8cf 100644
--- a/recipes/linux/linux-omap_git.bb
+++ b/recipes/linux/linux-omap_git.bb
@@ -19,48 +19,48 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.g
 	   file://defconfig"
 
 SRC_URI_append = " \
-                  file://ehci.patch;apply=yes \
-                  file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;apply=yes \
-                  file://cache/l1cache-shift.patch;apply=yes \
-                  file://cache/copy-page-tweak.patch;apply=yes \
-                  file://dss2/0001-OMAP2-Add-funcs-for-writing-SMS_ROT_-registers.patch;apply=yes \
-                  file://dss2/0002-OMAP-OMAPFB-split-omapfb.h.patch;apply=yes \
-                  file://dss2/0003-OMAP-OMAPFB-add-omapdss-device.patch;apply=yes \
-                  file://dss2/0004-OMAP-Add-VRAM-manager.patch;apply=yes \
-                  file://dss2/0005-OMAP-Add-support-for-VRFB-rotation-engine.patch;apply=yes \
-                  file://dss2/0006-OMAP-DSS2-Documentation-for-DSS2.patch;apply=yes \
-                  file://dss2/0007-OMAP-DSS2-Display-Subsystem-Driver-core.patch;apply=yes \
-                  file://dss2/0008-OMAP-DSS2-Add-more-core-files.patch;apply=yes \
-                  file://dss2/0009-OMAP-DSS2-DISPC.patch;apply=yes \
-                  file://dss2/0010-OMAP-DSS2-DPI-driver.patch;apply=yes \
-                  file://dss2/0011-OMAP-DSS2-Video-encoder-driver.patch;apply=yes \
-                  file://dss2/0012-OMAP-DSS2-RFBI-driver.patch;apply=yes \
-                  file://dss2/0013-OMAP-DSS2-SDI-driver.patch;apply=yes \
-                  file://dss2/0014-OMAP-DSS2-DSI-driver.patch;apply=yes \
-                  file://dss2/0015-OMAP-DSS2-omapfb-driver.patch;apply=yes \
-                  file://dss2/0016-OMAP-DSS2-Add-DPI-panel-drivers.patch;apply=yes \
-                  file://dss2/0017-OMAP-DSS2-Taal-DSI-command-mode-panel-driver.patch;apply=yes \
-                  file://dss2/0001-OMAP3-Enable-DSS2-for-OMAP3EVM-board.patch;apply=yes \
-                  file://dss2/0002-V4L2-Added-New-V4L2-CIDs-for-omap-devices-V4L2-IOCT.patch;apply=yes \
-                  file://dss2/0003-V4L2-Updated-v4l2_common-for-new-V4L2-CIDs.patch;apply=yes \
-                  file://dss2/0004-OMAP2-3-V4L2-Add-support-for-OMAP2-3-V4L2-driver-on.patch;apply=yes \
-                  file://expansion-boards/tincantools-zippy.patch;apply=yes \
-                  file://madc/madc-driver.patch;apply=yes \
-                  file://madc/madc.patch;apply=yes \
-                  file://arch-has-holes.diff;apply=yes \
-                  file://usb/0001-musb-fix-put_device-call-sequence.patch;apply=yes \
-                  file://usb/0008-omap3-Add-CHIP_GE_OMAP3430ES3-for-HSUSB.patch;apply=yes \
-                  file://usb/0011-musb-fix-musb-gadget_driver-NULL-bug.patch;apply=yes \
-                  file://usb/0012-musb-Add-back-old-musb-procfs-file.patch;apply=yes \
-                  file://usb/0013-musb-Remove-USB_SUSPEND-auto-select-with-OTG.patch;apply=yes \
-                  file://usb/0014-musb-disable-PING-on-status-phase-of-control-transf.patch;apply=yes \
-                  file://usb/0015-musb-Add-context-save-and-restore-support.patch;apply=yes \
-                  file://usb/0016-usb-update-defconfig.patch;apply=yes \
-                  file://usb/0001-ARM-OMAP-Fix-beagleboard-EHCI-setup.patch;apply=yes \
-                  file://modedb-hd720.patch;apply=yes \
-                  file://dss2/beagle-dss2-support.patch;apply=yes \
+                  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;apply=yes \
+                  file://fix-omap4.diff \
 "
 
 SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
diff --git a/recipes/linux/linux-openmoko-2.6.24_git.bb b/recipes/linux/linux-openmoko-2.6.24_git.bb
index 2a987d8..8ecdbc1 100644
--- a/recipes/linux/linux-openmoko-2.6.24_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.24_git.bb
@@ -14,14 +14,14 @@ PR = "r1"
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable \
   \
-  file://0001-squashfs-with-lzma.patch;apply=yes \
-  file://0002-squashfs-initrd.patch;apply=yes \
-  file://0003-squashfs-force-O2.patch;apply=yes \
-  file://0004-squashfs-Kconfig.patch;apply=yes \
-  file://0005-squashfs-Makefile.patch;apply=yes \
+  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;apply=yes \
-  file://gta01-fix-battery-class-name.patch;apply=yes \
+  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 cc5ab90..2234c1c 100644
--- a/recipes/linux/linux-openmoko-2.6.28_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.28_git.bb
@@ -13,7 +13,7 @@ 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-2.6.31_git.bb b/recipes/linux/linux-openmoko-2.6.31_git.bb
index 636a23f..2dd53a1 100644
--- a/recipes/linux/linux-openmoko-2.6.31_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.31_git.bb
@@ -14,18 +14,18 @@ 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;apply=yes \
+  file://0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch \
 # patches from Weiss's gdrm-2.6.31 branch
-  file://0001-DRM-for-platform-devices.patch;apply=yes \
-  file://0002-Glamo-DRM-and-KMS-driver.patch;apply=yes \
-  file://0003-Work-on-Glamo-core-for-DRM.patch;apply=yes \
-  file://0004-Add-JBT6k74-hook-for-use-by-KMS.patch;apply=yes \
+  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-Add-JBT6k74-hook-for-use-by-KMS.patch \
 # enable UBI+DRM+NFS+INOTIFY_USER
-  file://0004-gta02_defconfig-Enable-UBI-support.patch;apply=yes \
-  file://0005-gta02_defconfig-Enable-UBI-debug.patch;apply=yes \
-  file://0001-gta02_defconfig-Enable-GLAMO_DRM.patch;apply=yes \
-  file://0006-gta02-defconfig-enable-NFS-and-INOTIFY_USER.patch;apply=yes \
-  file://0007-gta02_defconfig-disable-LEDS_GTA02_VIBRATOR.patch;apply=yes \
+  file://0004-gta02_defconfig-Enable-UBI-support.patch \
+  file://0005-gta02_defconfig-Enable-UBI-debug.patch \
+  file://0001-gta02_defconfig-Enable-GLAMO_DRM.patch \
+  file://0006-gta02-defconfig-enable-NFS-and-INOTIFY_USER.patch \
+  file://0007-gta02_defconfig-disable-LEDS_GTA02_VIBRATOR.patch \
 "
 
 S = "${WORKDIR}/git"
diff --git a/recipes/linux/linux-openmoko-2.6.32_git.bb b/recipes/linux/linux-openmoko-2.6.32_git.bb
index 39e051a..9a9e1fb 100644
--- a/recipes/linux/linux-openmoko-2.6.32_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.32_git.bb
@@ -11,27 +11,27 @@ PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
 
 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;apply=yes \
+  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;apply=yes;name=stablepatch \
 # build fix
-  file://0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch;apply=yes \
+  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;apply=yes \
-  file://0003-usbhost.patch.patch;apply=yes \
-  file://0004-ar6000_delay.patch.patch;apply=yes \
-  file://0005-save_regs.patch.patch;apply=yes \
+  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;apply=yes \
+  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;apply=yes \
-  file://0008-Glamo-DRM-and-KMS-driver.patch;apply=yes \
-  file://0009-Work-on-Glamo-core-for-DRM.patch;apply=yes \
-  file://0010-JBT6k74-work-for-KMS.patch;apply=yes \
-  file://0011-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch;apply=yes \
-  file://0012-Fix-dynamic-command-queue-allocation.patch;apply=yes \
-  file://0013-Debug-statements-for-testing.patch;apply=yes \
-  file://0014-Fix-claim-of-2D-register-resource.patch;apply=yes \
+  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] = "ba6abb1ffee513a1d4f831599ddae490"
diff --git a/recipes/linux/linux-openmoko-2.6.34_git.bb b/recipes/linux/linux-openmoko-2.6.34_git.bb
index 999e9e3..5f9e659 100644
--- a/recipes/linux/linux-openmoko-2.6.34_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.34_git.bb
@@ -12,9 +12,9 @@ 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;apply=yes \
+  file://wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch \
 # defconfig updates
-  file://gta02-defconfig-update-for-2.6.34.patch;apply=yes \
+  file://gta02-defconfig-update-for-2.6.34.patch \
 "
 
 S = "${WORKDIR}/git"
diff --git a/recipes/linux/linux-openmoko-shr-devel_git.bb b/recipes/linux/linux-openmoko-shr-devel_git.bb
index 87ff91d..c01be58 100644
--- a/recipes/linux/linux-openmoko-shr-devel_git.bb
+++ b/recipes/linux/linux-openmoko-shr-devel_git.bb
@@ -13,8 +13,8 @@ PR = "r8"
 
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \
-  file://fix-install.patch;apply=yes \
-  file://0007-Enable-UBI-UBIFS.patch;apply=yes \
+  file://fix-install.patch \
+  file://0007-Enable-UBI-UBIFS.patch \
 "
 S = "${WORKDIR}/git"
 
diff --git a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb
index 5c458b0..c487f46 100644
--- a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb
+++ b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb
@@ -14,12 +14,12 @@ PR = "r5"
 
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=drm-tracking \
-  file://fix-install.patch;apply=yes \
-  file://0001-Add-drm-to-Makefile-version.patch;apply=yes \
-  file://0004-gta02_drm_defconfig-start-from-gta02_packaging_defco.patch;apply=yes \
-  file://0005-Enable-DRM-and-MFD_GLAMO_DRM.patch;apply=yes \
-  file://0006-Enable-I2C_ALGOBIT-from-make-oldconfig.patch;apply=yes \
-  file://0007-Enable-UBI-UBIFS.patch;apply=yes \
+  file://fix-install.patch \
+  file://0001-Add-drm-to-Makefile-version.patch \
+  file://0004-gta02_drm_defconfig-start-from-gta02_packaging_defco.patch \
+  file://0005-Enable-DRM-and-MFD_GLAMO_DRM.patch \
+  file://0006-Enable-I2C_ALGOBIT-from-make-oldconfig.patch \
+  file://0007-Enable-UBI-UBIFS.patch \
 "
 S = "${WORKDIR}/git"
 
diff --git a/recipes/linux/linux-orion_2.6.28.4.bb b/recipes/linux/linux-orion_2.6.28.4.bb
index 1b351ac..33e1207 100644
--- a/recipes/linux/linux-orion_2.6.28.4.bb
+++ b/recipes/linux/linux-orion_2.6.28.4.bb
@@ -8,20 +8,20 @@ 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;apply=yes;name=stablepatch \
-           file://kuropro-foonas-mtd.patch;apply=yes \
-           file://fw-and-powerpc-install.patch;apply=yes \
+           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;apply=yes"
-SRC_URI_append_mv2120 +=        "file://mv2120.patch;apply=yes"
-SRC_URI_append_kuropro +=       "file://kuropro.patch;apply=yes"
-SRC_URI_append_lspro +=         "file://lspro.patch;apply=yes"
-SRC_URI_append_tsx09 +=         "file://tsx09.patch;apply=yes"
-SRC_URI_append_ts409 +=         "file://ts409.patch;apply=yes"
+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-powerpc-fsl_git.bb b/recipes/linux/linux-powerpc-fsl_git.bb
index 34a7bd4..02eab8e 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;apply=yes"
-SRC_URI_append_calamari = " file://mpc8536ds.dts.patch;apply=yes"
+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-rp.checksums.inc b/recipes/linux/linux-rp.checksums.inc
index 737f79c..3271c39 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;apply=yes;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;apply=yes;name=rppatch2 \
+#           ${RPSRC}/hx2750_base-r34.patch;name=rppatch2 \
 SRC_URI[rppatch2.md5sum] = "38e1ea5768cba4be72088a8a12d4b1af"
 SRC_URI[rppatch2.sha256sum] = "837b95b128815f3d6689d2ecfbdc9a28023bae5f45879513f3b4c2ad12f459ee"
-#           ${RPSRC}/hx2750_bl-r9.patch;apply=yes;name=rppatch3 \
+#           ${RPSRC}/hx2750_bl-r9.patch;name=rppatch3 \
 SRC_URI[rppatch3.md5sum] = "ebb78f58e9c84c73b90e9cbdde5f89d6"
 SRC_URI[rppatch3.sha256sum] = "7578448fc2adbfc820158b2467dbb127ab012b3a97ad95366d8d1af002defbce"
-#           ${RPSRC}/hx2750_pcmcia-r3.patch;apply=yes;name=rppatch4 \
+#           ${RPSRC}/hx2750_pcmcia-r3.patch;name=rppatch4 \
 SRC_URI[rppatch4.md5sum] = "896d3e29ab5715b7558b972fba626425"
 SRC_URI[rppatch4.sha256sum] = "29f21117a17f945783f2eee5d5c89e10959fed44ac423ad9809d6afc0db5996c"
-#           ${RPSRC}/pxa_keys-r9.patch;apply=yes;name=rppatch5 \
+#           ${RPSRC}/pxa_keys-r9.patch;name=rppatch5 \
 SRC_URI[rppatch5.md5sum] = "c1358d4c210d1d701b5b0d96d8e73c12"
 SRC_URI[rppatch5.sha256sum] = "8697e76beb6ea44ce450e8cb9bed764803fe189eaea89e0aa72ebd1974bc52e4"
-#           ${RPSRC}/tsc2101-r19.patch;apply=yes;name=rppatch6 \
+#           ${RPSRC}/tsc2101-r19.patch;name=rppatch6 \
 SRC_URI[rppatch6.md5sum] = "c70fa3e0184842e4f6822b7002eac33e"
 SRC_URI[rppatch6.sha256sum] = "7ca39d0df0a102114eabcd39df94ff271d81a71d9ef9f61915ac0a04031b68d1"
-#           ${RPSRC}/hx2750_test1-r8.patch;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;name=rppatch11 \
+#           ${RPSRC}/pxa27x_overlay-r8.patch;name=rppatch11 \
 SRC_URI[rppatch11.md5sum] = "94926c8dbea9035ca9e5b44d9dd68726"
 SRC_URI[rppatch11.sha256sum] = "8848bf269257316e845857d58023fec82e7e2ff5a8092915ec4a8b033429a5cc"
-#           ${RPSRC}/w100_extaccel-r2.patch;apply=yes;name=rppatch12 \
+#           ${RPSRC}/w100_extaccel-r2.patch;name=rppatch12 \
 SRC_URI[rppatch12.md5sum] = "2c958056e0a82da4d85810ea51b9e07b"
 SRC_URI[rppatch12.sha256sum] = "c8e0cf191fb60b26eb5481c24d162c3675c72bc940c42393af2f0b62897de90f"
-#           ${RPSRC}/w100_extmem-r1.patch;apply=yes;name=rppatch13 \
+#           ${RPSRC}/w100_extmem-r1.patch;name=rppatch13 \
 SRC_URI[rppatch13.md5sum] = "a17be90788c4ccd6ee8253659b9321f8"
 SRC_URI[rppatch13.sha256sum] = "56dfd5365848095793faa31ee1cf753c10891dd076944d3533b05c6547965134"
-#           ${RPSRC}/poodle_pm-r6.patch;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;name=rppatch23 \
+#           ${RPSRC}/pxa27x_overlay-r5.patch;name=rppatch23 \
 SRC_URI[rppatch23.md5sum] = "6aaf8527d5e7af634ec7067f731d4702"
 SRC_URI[rppatch23.sha256sum] = "436422924eede3d68758b84b2cd3b7fc0f204454fa9577b366acbd6c0c4c87e7"
-#           ${RPSRC}/input_power-r7.patch;apply=yes;name=rppatch24 \
+#           ${RPSRC}/input_power-r7.patch;name=rppatch24 \
 SRC_URI[rppatch24.md5sum] = "25bbe0e1412dce7f36f54392872c673c"
 SRC_URI[rppatch24.sha256sum] = "8526befd5b233a5911ccc6b6db4bba29ca3156db2828c11b5c696aa2e506c621"
-#           ${RPSRC}/lzo_kernel-r0.patch;apply=yes;name=rppatch25 \
+#           ${RPSRC}/lzo_kernel-r0.patch;name=rppatch25 \
 SRC_URI[rppatch25.md5sum] = "58f444edda4cc611236cfc2641905ca2"
 SRC_URI[rppatch25.sha256sum] = "932760a92ad3b7bad483a9587dddf7784f9084676cfe7fbb2352681165b594d7"
-#           ${RPSRC}/lzo_jffs2-r0.patch;apply=yes;name=rppatch26 \
+#           ${RPSRC}/lzo_jffs2-r0.patch;name=rppatch26 \
 SRC_URI[rppatch26.md5sum] = "397be20b7a23c6d540bd6cb05ed782b6"
 SRC_URI[rppatch26.sha256sum] = "9fb2878799a6f80687bf5623a94cc96ba72272041f1a5f18fddf24831c4e3764"
-#           ${RPSRC}/lzo_crypto-r0b.patch;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;name=rppatch37 \
+#           ${RPSRC}/hx2750_base-r29.patch;name=rppatch37 \
 SRC_URI[rppatch37.md5sum] = "362aa4d1318108a3515510ea1bbe31a1"
 SRC_URI[rppatch37.sha256sum] = "66b557a709a87a6d90c5a1d6d385b1bb5a725144b3f6a3c7c466c48702f4ad87"
-#           ${RPSRC}/hx2750_pcmcia-r2.patch;apply=yes;name=rppatch38 \
+#           ${RPSRC}/hx2750_pcmcia-r2.patch;name=rppatch38 \
 SRC_URI[rppatch38.md5sum] = "f61363f48e8fbc1086dd3a9c66385a32"
 SRC_URI[rppatch38.sha256sum] = "f3ab5ae2056960612886adce53ed46f4b5516744b1394f40c85cedbf0ec2e29e"
-#           ${RPSRC}/hx2750_make.patch;apply=yes;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;apply=yes;name=rppatch40 \
+#           ${RPSRC}/pxa_keys-r7.patch;name=rppatch40 \
 SRC_URI[rppatch40.md5sum] = "6cb642dc01dc93a99fac3f4894a432c7"
 SRC_URI[rppatch40.sha256sum] = "f6dc5a05456a6d4abb9e8b80df70aefac6f8764d04e079aa4c4c5b45cd0ff9bc"
-#           ${RPSRC}/tsc2101-r16.patch;apply=yes;name=rppatch41 \
+#           ${RPSRC}/tsc2101-r16.patch;name=rppatch41 \
 SRC_URI[rppatch41.md5sum] = "28d2b552a3d416c35119bc3f459c0c1a"
 SRC_URI[rppatch41.sha256sum] = "c2bed5d4ec064e0ac9c73c046e545dfad5ebfce3c84bdade1323a9f7a5265056"
-#           ${RPSRC}/hx2750_test1-r7.patch;apply=yes;name=rppatch42 \
+#           ${RPSRC}/hx2750_test1-r7.patch;name=rppatch42 \
 SRC_URI[rppatch42.md5sum] = "1d102d122b9697b9bdbd209349af1645"
 SRC_URI[rppatch42.sha256sum] = "359a3839deeba78534bba50c3a2929736d823c3cdb7164a910226c4559ae97a2"
-#           ${RPSRC}/input_power-r9.patch;apply=yes;name=rppatch43 \
+#           ${RPSRC}/input_power-r9.patch;name=rppatch43 \
 SRC_URI[rppatch43.md5sum] = "1bd8229ec73078c5d7025d28774bc866"
 SRC_URI[rppatch43.sha256sum] = "fb86683341f1d09471d9301c43e77c0c50cc1cc8e2462e282d50951ca017daa3"
-#           ${RPSRC}/pxa25x_cpufreq-r2.patch;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;name=rppatch48 \
+#           ${RPSRC}/pxa27x_overlay-r6.patch;name=rppatch48 \
 SRC_URI[rppatch48.md5sum] = "929218c453c881fe5b3d94c65eb6fe7a"
 SRC_URI[rppatch48.sha256sum] = "f93eddd05d690599c85510372729c28e0d2f25619fb36aef22318bdf863b46a9"
-#           ${RPSRC}/poodle_pm-r4.patch;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;name=rppatch57 \
+#           ${RPSRC}/hx2750_base-r33.patch;name=rppatch57 \
 SRC_URI[rppatch57.md5sum] = "e9ef4b8b78ab64cd7dbd0d41b05e932c"
 SRC_URI[rppatch57.sha256sum] = "ed4f25e0da55714c618c2721209a2d22a7296b5dc85af028d20aff6062a4a13b"
-#           ${RPSRC}/pxa_keys-r8.patch;apply=yes;name=rppatch58 \
+#           ${RPSRC}/pxa_keys-r8.patch;name=rppatch58 \
 SRC_URI[rppatch58.md5sum] = "4f41fd3a0e031a26d3a2d354f5995ffd"
 SRC_URI[rppatch58.sha256sum] = "3959a45bb65f66a622d7752e41808604032f4ab66f736f96fee83e252d85df5a"
-#           ${RPSRC}/tsc2101-r18.patch;apply=yes;name=rppatch59 \
+#           ${RPSRC}/tsc2101-r18.patch;name=rppatch59 \
 SRC_URI[rppatch59.md5sum] = "95e9a5dfc1852e2db3d1d9da6df439df"
 SRC_URI[rppatch59.sha256sum] = "83097559d413b57aa67da1de975e8fbb99d02a2b2166aad57d7b30881208ff1e"
-#           ${RPSRC}/input_power-r10.patch;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;name=rppatch64 \
+#           ${RPSRC}/poodle_pm-r5.patch;name=rppatch64 \
 SRC_URI[rppatch64.md5sum] = "3ed63ce3884d6cdd71b6d471e3c49407"
 SRC_URI[rppatch64.sha256sum] = "e87d44d5a77c591db83598295109c033708a458797247a31cfa20d54c52d7b41"
 
-#           ${CHSRC}/tmio-core-r4.patch;apply=yes;name=chpatch1 \
+#           ${CHSRC}/tmio-core-r4.patch;name=chpatch1 \
 SRC_URI[chpatch1.md5sum] = "2e7f84f2620d9de8a2a924224f20ba99"
 SRC_URI[chpatch1.sha256sum] = "b9505729d2282ba5db99f60b211a12233b6f1cc0b6340681b1722002c97c86e6"
-#           ${CHSRC}/tmio-fb-r6.patch;apply=yes;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;apply=yes;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;apply=yes;name=tkpatch2 \
+#        ${TKSRC}/mcp-sa11x0-r0.patch;name=tkpatch2 \
 SRC_URI[tkpatch2.md5sum] = "04468563b3b6942e72844904f1c34e9b"
 SRC_URI[tkpatch2.sha256sum] = "1112d3ea07f519ca7a45b6c82b43a9d368ba2d8a4a4244172b5e66f63eee6fb8"
-#        ${TKSRC}/locomo-r1.patch;apply=yes;name=tkpatch3 \
+#        ${TKSRC}/locomo-r1.patch;name=tkpatch3 \
 SRC_URI[tkpatch3.md5sum] = "31c32cadae5a7469cf94bf8bae658515"
 SRC_URI[tkpatch3.sha256sum] = "788f1cc9c699c60408591eba0a057bfdf51cedef539b52fe8ddba39dd948aee6"
-#        ${TKSRC}/collie-kexec-r1.patch;apply=yes;name=tkpatch4 \
+#        ${TKSRC}/collie-kexec-r1.patch;name=tkpatch4 \
 SRC_URI[tkpatch4.md5sum] = "ed96c1bddce4b7e40a40bad1d3cd63b5"
 SRC_URI[tkpatch4.sha256sum] = "c178b3a7460cfaeb58c11ef9641d72ee912818b2ecbf1c09edf628d9168c0971"
-#        ${TKSRC}/sharpsl_pm-4.patch;apply=yes;name=tkpatch5 \
+#        ${TKSRC}/sharpsl_pm-4.patch;name=tkpatch5 \
 SRC_URI[tkpatch5.md5sum] = "39b7dd5a77cf267d104e57dbfbfb1789"
 SRC_URI[tkpatch5.sha256sum] = "a9880d7408e73c6c74ae975ed7fd20b2563459b68d6c4afdfc20f033c95b4d8b"
-#        ${TKSRC}/collie_pm-3.patch;apply=yes;name=tkpatch6 \
+#        ${TKSRC}/collie_pm-3.patch;name=tkpatch6 \
 SRC_URI[tkpatch6.md5sum] = "812ee8bf3ea5739acb0ab2f732ecdc20"
 SRC_URI[tkpatch6.sha256sum] = "8bb75a2577c72b4ad95851e545aafc7b0b89c3c41f087aea76b28635786f11c7"
-#        ${TKSRC}/ucb1x00_suspend.patch;apply=yes;name=tkpatch7 \
+#        ${TKSRC}/ucb1x00_suspend.patch;name=tkpatch7 \
 SRC_URI[tkpatch7.md5sum] = "8cf0f9e1158bf04cccb65a0926221888"
 SRC_URI[tkpatch7.sha256sum] = "502e6c62fd930639987e34fbb1aaeb7b1456e2743e0d6986faf0990257921435"
-#        ${TKSRC}/collie-ts.patch;apply=yes;name=tkpatch8 \
+#        ${TKSRC}/collie-ts.patch;name=tkpatch8 \
 SRC_URI[tkpatch8.md5sum] = "a62bacafed0ca1d8384b848a1de49728"
 SRC_URI[tkpatch8.sha256sum] = "a3e0ad85beb1b3ae6e33978c540b2e83746e9c1e2766da2d59509d9c0345f218"
-#        ${TKSRC}/pcmcia_suspend.patch;apply=yes;name=tkpatch9 \
+#        ${TKSRC}/pcmcia_suspend.patch;name=tkpatch9 \
 SRC_URI[tkpatch9.md5sum] = "52423f0766882809c5ace9ed4ccb2131"
 SRC_URI[tkpatch9.sha256sum] = "c701207f506e3975510a9abc07eaab59f3e7e1fb13b8045ff1fff33964f4be89"
-#        ${TKSRC}/locomo_spi-6.patch;apply=yes;name=tkpatch10 \
+#        ${TKSRC}/locomo_spi-6.patch;name=tkpatch10 \
 SRC_URI[tkpatch10.md5sum] = "44bb0f9f1fb07efbbb41619a44ed04ce"
 SRC_URI[tkpatch10.sha256sum] = "50502256533d1fc62ac3f4a29a7e212835592bfbfd47f36b607c20e72297a63d"
-#        ${TKSRC}/config.patch;apply=yes;name=tkpatch11 \
+#        ${TKSRC}/config.patch;name=tkpatch11 \
 SRC_URI[tkpatch11.md5sum] = "c8be31ffebdae0e007ea587a11994e75"
 SRC_URI[tkpatch11.sha256sum] = "64dfe89e56167bde80c6a18831b5a4259215c78c34ca16f4cb9fde10ffe54437"
-#        ${TKSRC}/mmc-spi.patch;apply=yes;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;apply=yes;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;apply=yes;name=tkpatch14 \
+#        ${TKSRC}/sa1100_spinlock.patch;name=tkpatch14 \
 SRC_URI[tkpatch14.md5sum] = "946368c1a4961ac0362436e967055f76"
 SRC_URI[tkpatch14.sha256sum] = "16554de4368956c1d3e1be4245d388bff4767390f2183bfe35b04327def508a5"
-#        ${TKSRC}/sa1100-dma.patch;apply=yes;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;apply=yes;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;apply=yes;name=tkpatch17 \
+#        ${TKSRC}/locomokeyb-2.patch;name=tkpatch17 \
 #SRC_URI[tkpatch17.md5sum] = ""
 #SRC_URI[tkpatch17.sha256sum] = ""
 
-#          ${DOSRC}/collie/mtd-sharp-flash-hack-r0.patch;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;name=dopatch7 \
+#          ${DOSRC}/tosa-pxaac97-r6.patch;name=dopatch7 \
 SRC_URI[dopatch7.md5sum] = "17dce7cf6276af37ae9b26d0bb381dc2"
 SRC_URI[dopatch7.sha256sum] = "7ebee992bbcb4c6c745f70bd59cf9fe58fb6e36ef183b05c64ef3bcf802f8208"
-#          ${DOSRC}/tosa-tmio-r6.patch;apply=yes;name=dopatch8 \
+#          ${DOSRC}/tosa-tmio-r6.patch;name=dopatch8 \
 SRC_URI[dopatch8.md5sum] = "d4088e44285ce609d41455cf3b31772a"
 SRC_URI[dopatch8.sha256sum] = "ec732cb9ec9522c04769f9e41fab7288e7cdff6566eee18b5ab74542b5d9575a"
-#          ${DOSRC}/tosa-asoc-r1.patch;apply=yes;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;apply=yes;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 5ae333a..0ef0655 100644
--- a/recipes/linux/linux-rp_2.6.23.bb
+++ b/recipes/linux/linux-rp_2.6.23.bb
@@ -16,54 +16,54 @@ PR = "r36"
 #
 
 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;apply=yes \
-           ${RPSRC}/pxa25x_suspend_fixes-r0.patch;apply=yes;status=merged;name=rppatch30 \
-           ${RPSRC}/lzo_jffs2-r3.patch;apply=yes;status=merged;name=rppatch31 \
-           ${RPSRC}/lzo_jffs2_lzomode-r1.patch;apply=yes;status=merged;name=rppatch32 \
-           ${RPSRC}/spitzkbd_fix-r0.patch;apply=yes;status=merged;name=rppatch33 \
-           file://uvesafb-0.1-rc3-2.6.22.patch;apply=yes;status=merged \
-           ${RPSRC}/locomo_led_fix-r0.patch;apply=yes;status=merged;name=rppatch34 \
-           file://hrw-add-wcf11-to-hostap.patch;apply=yes;status=merged \
-           ${RPSRC}/export_atags-r0a.patch;apply=yes;status=pending;name=rppatch35 \
-           ${RPSRC}/lzo_crypto-r2.patch;apply=yes;status=pending;name=rppatch36 \
-           ${RPSRC}/lzo_jffs2_sysfs-r1.patch;apply=yes;name=rppatch1 \
-           ${RPSRC}/hx2750_base-r29.patch;apply=yes;name=rppatch37 \
-           ${RPSRC}/hx2750_bl-r9.patch;apply=yes;name=rppatch3 \
-           ${RPSRC}/hx2750_pcmcia-r2.patch;apply=yes;name=rppatch38 \
-           file://hx2750_make.patch;apply=yes;name=rppatch39 \
-           ${RPSRC}/pxa_keys-r7.patch;apply=yes;name=rppatch40 \
-           ${RPSRC}/tsc2101-r16.patch;apply=yes;name=rppatch41 \
-           ${RPSRC}/hx2750_test1-r7.patch;apply=yes;name=rppatch42 \
-           ${RPSRC}/input_power-r9.patch;apply=yes;name=rppatch43 \
-           ${RPSRC}/pxa25x_cpufreq-r2.patch;apply=yes;name=rppatch44 \
-           ${RPSRC}/sharpsl_pm_fixes1-r0.patch;apply=yes;name=rppatch8 \
-           ${RPSRC}/pm_changes-r1.patch;apply=yes;name=rppatch9 \
-           ${RPSRC}/usb_add_epalloc-r3.patch;apply=yes;name=rppatch45 \
-           ${RPSRC}/usb_pxa27x_udc-r6.patch;apply=yes;name=rppatch46 \
-           ${RPSRC}/locomo_kbd_tweak-r1.patch;apply=yes;name=rppatch47 \
-           ${RPSRC}/pxa27x_overlay-r6.patch;apply=yes;name=rppatch48 \
-           ${RPSRC}/w100_extaccel-r2.patch;apply=yes;name=rppatch12 \
-           ${RPSRC}/w100_extmem-r1.patch;apply=yes;name=rppatch13 \
-           ${RPSRC}/poodle_pm-r4.patch;apply=yes;name=rppatch49 \
-           ${RPSRC}/poodle_lcd_hack-r0.patch;apply=yes;name=rppatch15 \
-           ${RPSRC}/poodle_asoc_fix-r1.patch;apply=yes;name=rppatch16 \
-           file://wm8750-treble.patch;apply=yes \
-           file://mtd-module.patch;apply=yes \
-           file://squashfs3.0-2.6.15.patch;apply=yes;status=external \
-           ${RPSRC}/logo_oh-r1.patch.bz2;apply=yes;status=unmergable;name=rppatch17 \
-           ${RPSRC}/pxa-linking-bug.patch;apply=yes;status=unmergable;name=rppatch18 \
-           file://hostap-monitor-mode.patch;apply=yes;status=unmergable \
-           file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;apply=yes;status=unmergable \
-           ${RPSRC}/mmcsd_large_cards-r1.patch;apply=yes;status=hack;name=rppatch19 \
-           ${RPSRC}/mmcsd_no_scr_check-r2.patch;apply=yes;status=hack;name=rppatch20 \
-           ${RPSRC}/integrator_rgb-r1.patch;apply=yes;status=hack;name=rppatch21 \
-           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;apply=yes;status=hack;name=rppatch22 \
-           file://pxa-serial-hack.patch;apply=yes;status=hack \
-           file://connectplus-remove-ide-HACK.patch;apply=yes;status=hack \
-           file://connectplus-prevent-oops-HACK.patch;apply=yes;status=hack \
-           file://htcuni.patch;apply=yes \
-           file://binutils-buildid-arm.patch;apply=yes \
-           file://versatile-armv6.patch;apply=yes \
+	   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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;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;apply=yes;name=dopatch1 \
-           ${DOSRC}/collie/collie-r0.patch;apply=yes;name=dopatch2 \
-           ${DOSRC}/collie/locomolcd-backlight-r0.patch;apply=yes;name=dopatch3 \
-           ${DOSRC}/collie/ucb1x00-touch-audio-r0.patch;apply=yes;name=dopatch4 \
-           file://collie-mcp-r1.patch;apply=yes \
-           ${DOSRC}/collie/sa1100-udc-r0.patch;apply=yes;name=dopatch5 \
-#          ${DOSRC}/collie/collie-pm-r1.patch;apply=yes;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;apply=yes;name=rppatch53 \
+           ${RPSRC}/poodle_serial_vcc-r0.patch;name=rppatch53 \
 "
 
 SRC_URI_append_tosa = "\
-           ${CHSRC}/tmio-core-r4.patch;apply=yes;name=chpatch1 \
-           file://tmio-tc6393-r8.patch;apply=yes \
-           file://tmio-nand-r8.patch;apply=yes \
-           ${CHSRC}/tmio-fb-r6.patch;apply=yes;name=chpatch2 \
-	   file://tmio-fb-r6-fix-r0.patch;apply=yes \
-           file://tosa-keyboard-r19.patch;apply=yes \
-           ${DOSRC}/tosa-pxaac97-r6.patch;apply=yes;name=dopatch7 \
-	   file://tosa-pxaac97-r6-fix-r0.patch;apply=yes \
-           ${DOSRC}/tosa-tmio-r6.patch;apply=yes;name=dopatch8 \
-           file://tosa-power-r18.patch;apply=yes \
-           file://tosa-power-r18-fix-r0.patch;apply=yes \
-           file://tosa-tmio-lcd-r10.patch;apply=yes \
-           file://tosa-tmio-lcd-r10-fix-r0.patch;apply=yes \
-           file://tosa-bluetooth-r8.patch;apply=yes \
-           file://wm97xx-lg13-r0.patch;apply=yes \
-           file://wm97xx-lg13-r0-fix-r0.patch;apply=yes \
-           file://wm9712-suspend-cold-res-r2.patch;apply=yes \
-           file://sharpsl-pm-postresume-r1.patch;apply=yes \
-           file://wm9712-reset-loop-r2.patch;apply=yes \
-           file://tosa-lcdnoise-r1.patch;apply=yes \
-           file://tosa-lcdnoise-r1-fix-r0.patch;apply=yes \
-	   file://arm-dma-coherent.patch;apply=yes \
-           file://usb-ohci-hooks-r3.patch;apply=yes \
-           file://tmio-ohci-r9.patch;apply=yes \
-           file://pxa2xx_udc_support_inverse_vbus.patch;apply=yes \
-           file://tosa_udc_use_gpio_vbus.patch;apply=yes \
+           ${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;apply=yes;name=dopatch9 "
+#          ${DOSRC}/tosa-asoc-r1.patch;name=dopatch9 "
 
 SRC_URI_append_akita = "\
-           file://sharpsl-rc-r1.patch;apply=yes;status=external \
+           file://sharpsl-rc-r1.patch;status=external \
            "
 
 SRC_URI_append_spitz = "\
-           file://sharpsl-rc-r1.patch;apply=yes;status=external \
+           file://sharpsl-rc-r1.patch;status=external \
            "
 
 SRC_URI_append_htcuniversal ="\
-	file://htcuni-acx.patch;apply=yes;status=external \
+	file://htcuni-acx.patch;status=external \
 	"
 
 SRC_URI_append_zylonite ="\
-	file://arm_pxa_20070923.patch;apply=yes \
-	file://pxa_fb_overlay.patch;apply=yes \
-	file://zylonite-boot.patch;apply=yes \
-	file://zylonite_mtd-r0.patch;apply=yes \
-	file://zylonite_touch-r0.patch;apply=yes \
-	file://zylonite_keypad-r0.patch;apply=yes \
+	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 9d6330d..c16c187 100644
--- a/recipes/linux/linux-rp_2.6.24.bb
+++ b/recipes/linux/linux-rp_2.6.24.bb
@@ -23,54 +23,54 @@ DEFAULT_PREFERENCE_spitz = "1"
 # 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;apply=yes \
-           ${RPSRC}/export_atags-r2.patch;apply=yes;status=pending;name=rppatch54 \
-           ${RPSRC}/lzo_crypto-r2.patch;apply=yes;status=pending;name=rppatch36 \
-           ${RPSRC}/corgi_rearrange_lcd-r0.patch;apply=yes;status=pending;name=rppatch55 \
-	   file://hrw-hostapcard.patch;apply=yes;status=pending \
-           ${RPSRC}/allow_disable_deferrred-r0.patch;apply=yes;name=rppatch56 \
-           ${RPSRC}/lzo_jffs2_sysfs-r1.patch;apply=yes;name=rppatch1 \
-           ${RPSRC}/hx2750_base-r33.patch;apply=yes;name=rppatch57 \
-           ${RPSRC}/hx2750_bl-r9.patch;apply=yes;name=rppatch3 \
-           ${RPSRC}/hx2750_pcmcia-r3.patch;apply=yes;name=rppatch4 \
-           ${RPSRC}/pxa_keys-r8.patch;apply=yes;name=rppatch58 \
-           ${RPSRC}/tsc2101-r18.patch;apply=yes;name=rppatch59 \
-           ${RPSRC}/hx2750_test1-r8.patch;apply=yes;name=rppatch7 \
-           ${RPSRC}/input_power-r10.patch;apply=yes;name=rppatch60 \
-           ${RPSRC}/pxa25x_cpufreq-r2.patch;apply=yes;name=rppatch44 \
-           ${RPSRC}/sharpsl_pm_fixes1-r0.patch;apply=yes;name=rppatch8 \
-           ${RPSRC}/pm_changes-r1.patch;apply=yes;name=rppatch9 \
-           ${RPSRC}/usb_add_epalloc-r4.patch;apply=yes;name=rppatch61 \
-           ${RPSRC}/usb_pxa27x_udc-r8.patch;apply=yes;name=rppatch62 \
-           ${RPSRC}/locomo_kbd_tweak-r1a.patch;apply=yes;name=rppatch63 \
-           ${RPSRC}/pxa27x_overlay-r8.patch;apply=yes;name=rppatch11 \
-           ${RPSRC}/w100_extaccel-r2.patch;apply=yes;name=rppatch12 \
-           ${RPSRC}/w100_extmem-r1.patch;apply=yes;name=rppatch13 \
-           ${RPSRC}/poodle_pm-r5.patch;apply=yes;name=rppatch64 \
-           ${RPSRC}/poodle_lcd_hack-r0.patch;apply=yes;name=rppatch15 \
-           ${RPSRC}/poodle_asoc_fix-r1.patch;apply=yes;name=rppatch16 \
-           file://pxa27x-resume.patch;apply=yes;status=external \
-           file://mtd-module.patch;apply=yes;status=external \
-           file://wm8750-treble.patch;apply=yes;status=external \
-           file://spitz_h_rewrite.patch;apply=yes;status=external \
-           file://pxa2xx_udc-clock.patch;apply=yes \
-           file://sharpsl-rc-r1.patch;apply=yes \
-           file://sharpsl-rc-r2.patch;apply=yes \
-           file://squashfs3.3.patch;apply=yes;status=external \
-#           ${RPSRC}/logo_oh-r1.patch.bz2;apply=yes;status=unmergable;name=rppatch17 \
-           ${RPSRC}/pxa-linking-bug.patch;apply=yes;status=unmergable;name=rppatch18 \
-           file://hostap-monitor-mode.patch;apply=yes;status=unmergable \
-           file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;apply=yes;status=unmergable \
-           ${RPSRC}/mmcsd_large_cards-r1.patch;apply=yes;status=hack;name=rppatch19 \
-           ${RPSRC}/mmcsd_no_scr_check-r2.patch;apply=yes;status=hack;name=rppatch20 \
-           ${RPSRC}/integrator_rgb-r1.patch;apply=yes;status=hack;name=rppatch21 \
-           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;apply=yes;status=hack;name=rppatch22 \
-           file://pxa-serial-hack.patch;apply=yes;status=hack \
-           file://connectplus-remove-ide-HACK.patch;apply=yes;status=hack \
-           file://connectplus-prevent-oops-HACK.patch;apply=yes;status=hack \
-           file://binutils-buildid-arm.patch;apply=yes \
-           file://versatile-armv6.patch;apply=yes \
-	   file://htcuni.patch;apply=yes \
+	   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;apply=yes;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;apply=yes;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;apply=yes;name=rppatch52 \
+#            ${RPSRC}/usb_rndis_tweaks-r0.patch;name=rppatch52 \
 
 
 SRC_URI_append_collie = "\
-	${TKSRC}/mtd-sharp-flash-hack-r4.patch;apply=yes;name=tkpatch1 \
-	${TKSRC}/mcp-sa11x0-r0.patch;apply=yes;name=tkpatch2 \
-	${TKSRC}/locomo-r1.patch;apply=yes;name=tkpatch3 \
-	${TKSRC}/collie-kexec-r1.patch;apply=yes;name=tkpatch4 \
-	${TKSRC}/sharpsl_pm-4.patch;apply=yes;name=tkpatch5 \
-	${TKSRC}/collie_pm-3.patch;apply=yes;name=tkpatch6 \
-	${TKSRC}/ucb1x00_suspend.patch;apply=yes;name=tkpatch7 \
-	${TKSRC}/collie-ts.patch;apply=yes;name=tkpatch8 \
-	${TKSRC}/pcmcia_suspend.patch;apply=yes;name=tkpatch9 \
-	${TKSRC}/locomo_spi-6.patch;apply=yes;name=tkpatch10 \
-	${TKSRC}/config.patch;apply=yes;name=tkpatch11 \
-	${TKSRC}/mmc-spi.patch;apply=yes;name=tkpatch12 \
-	${TKSRC}/linux-2.6.24-SIMpad-rtc-sa1100.patch;apply=yes;name=tkpatch13 \
-	${TKSRC}/sa1100_spinlock.patch;apply=yes;name=tkpatch14 \
-	${TKSRC}/sa1100-dma.patch;apply=yes;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;apply=yes;name=rppatch53 \
-           file://poodle_ts.patch;apply=yes \
-           file://pxafb.patch;apply=yes \
+           ${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;apply=yes \
-           file://tosa/0002-Modify-dma_alloc_coherent-on-ARM-so-that-it-supports.patch;apply=yes \
-           file://tosa/0003-Core-MFD-support.patch;apply=yes \
-           file://tosa/0004-Add-support-for-tc6393xb-MFD-core.patch;apply=yes \
-           file://tosa/0005-Add-support-for-tc6387xb-MFD-core.patch;apply=yes \
-           file://tosa/0006-Add-support-for-t7l66xb-MFD-core.patch;apply=yes \
-           file://tosa/0007-Common-headers-for-TMIO-MFD-subdevices.patch;apply=yes \
-           file://tosa/0008-Nand-driver-for-TMIO-devices.patch;apply=yes \
-           file://tosa/0009-FB-driver-for-TMIO-devices.patch;apply=yes \
-           file://tosa/0010-OHCI-driver-for-TMIO-devices.patch;apply=yes \
-           file://tosa/0011-MMC-driver-for-TMIO-devices.patch;apply=yes \
-           file://tosa/0012-Tosa-keyboard-support.patch;apply=yes \
-           file://tosa/0013-USB-gadget-pxa2xx_udc-supports-inverted-vbus.patch;apply=yes \
-           file://tosa/0014-tosa_udc_use_gpio_vbus.patch.patch;apply=yes \
-           file://tosa/0015-sharpsl-export-params.patch;apply=yes \
-           file://tosa/0016-This-patch-fixes-the-pxa25x-clocks-definitions-to-ad.patch;apply=yes \
-           file://tosa/0026-I-don-t-think-we-should-check-for-IRQs-when-determin.patch;apply=yes \
-           file://tosa/0027-Add-LiMn-one-of-the-most-common-for-small-non-recha.patch;apply=yes \
-           file://tosa/0028-Add-suspend-resume-wakeup-support-for-pda_power.patch;apply=yes \
-           file://tosa/0029-Support-using-VOLTAGE_-properties-for-apm-calculati.patch;apply=yes \
-           file://tosa/0030-Core-driver-for-WM97xx-touchscreens.patch;apply=yes \
-           file://tosa/0031-Add-chip-driver-for-WM9705-touchscreen.patch;apply=yes \
-           file://tosa/0032-Add-chip-driver-for-WM9712-touchscreen.patch;apply=yes \
-           file://tosa/0033-Add-chip-driver-for-WM9713-touchscreen.patch;apply=yes \
-           file://tosa/0034-Driver-for-WM97xx-touchscreens-in-streaming-mode-on.patch;apply=yes \
-           file://tosa/0035-Build-system-and-MAINTAINERS-entry-for-WM97xx-touchs.patch;apply=yes \
-           file://tosa/0036-Set-id-to-1-for-wm97xx-subdevices.patch;apply=yes \
-           file://tosa/0037-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch;apply=yes \
-           file://tosa/0038-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch;apply=yes \
-           file://tosa/0044-fix-tmio_mmc-debug-compilation.patch;apply=yes \
-           file://tosa/0045-Update-tmio_ohci.patch;apply=yes \
-           file://tosa/0046-patch-tc6393xb-cleanup.patch;apply=yes \
-           file://tosa/0047-tc6393xb-use-bitmasks-instead-of-bit-field-structs.patch;apply=yes \
-           file://tosa/0048-tc6393xb-GPIO-support.patch;apply=yes \
-           file://tosa/0049-platform-support-for-TMIO-on-tosa.patch;apply=yes \
-           file://tosa/0050-tosa-update-for-tc6393xb-gpio.patch;apply=yes \
-           file://tosa/0051-fix-sound-soc-pxa-tosa.c-to-new-gpio-api.patch;apply=yes \
-           file://tosa/0052-tosa-platform-backlight-support.patch;apply=yes \
-           file://tosa/0053-sound-soc-codecs-wm9712.c-28.patch;apply=yes \
-           file://tosa/0054-sound-soc-codecs-wm9712.c-2.patch;apply=yes \
-           file://tosa/0055-Add-GPIO_POWERON-to-the-list-of-devices-that-we-supp.patch;apply=yes \
-           file://tosa/0058-Fix-tosakbd-suspend.patch;apply=yes \
-           file://tosa/0059-patch-tosa-wakeup-test.patch;apply=yes \
-           file://tosa/0060-Add-support-for-power_supply-on-tosa.patch;apply=yes \
-           file://tosa/0061-tosa-bat-unify.patch;apply=yes \
-           file://tosa/0062-tosa-bat-fix-charging.patch;apply=yes \
-           file://tosa/0063-patch-tosa-bat-jacket-detect.patch;apply=yes \
-           file://tosa/0064-Export-modes-via-sysfs.patch;apply=yes \
-           file://tosa/0065-wm97xx-core-fixes.patch;apply=yes \
-           file://tosa/0066-tmiofb_probe-should-be-__devinit.patch;apply=yes \
-           file://tosa/0067-modeswitching.patch;apply=yes \
-           file://tosa/0068-Preliminary-tosa-denoiser.patch;apply=yes \
-           file://tosa/0019-pxa-remove-periodic-mode-emulation-support.patch;apply=yes \
-           file://tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch;apply=yes \
-           file://tosa/0021-Add-an-empty-drivers-gpio-directory-for-gpiolib-infr.patch;apply=yes \
-           file://tosa/0022-Provide-new-implementation-infrastructure-that-platf.patch;apply=yes \
-           file://tosa/0023-This-adds-gpiolib-support-for-the-PXA-architecture.patch;apply=yes \
-           file://tosa/0024-Update-Documentation-gpio.txt-primarily-to-include.patch;apply=yes \
-           file://tosa/0025-Signed-off-by-Dmitry-Baryshkov-dbaryshkov-gmail.co.patch;apply=yes \
-           file://tosa/0039-Add-generic-framework-for-managing-clocks.patch;apply=yes \
-           file://tosa/0040-Clocklib-debugfs-support.patch;apply=yes \
-           file://tosa/0041-From-80a359e60c2aec59ccf4fca0a7fd20495f82b1d2-Mon-Se.patch;apply=yes \
-           file://tosa/0042-Use-correct-clock-for-IrDA-on-pxa.patch;apply=yes \
-           file://tosa/0043-Use-clocklib-for-sa1100-sub-arch.patch;apply=yes \
-           file://tosa/0056-Support-resetting-by-asserting-GPIO-pin.patch;apply=yes \
-           file://tosa/0057-Clean-up-tosa-resetting.patch;apply=yes \
-           file://tosa/0001-pxa2xx-ac97-switch-AC-unit-to-correct-state-before.patch;apply=yes \
-	   file://tosa/tosa-bl-fixup.diff;apply=yes \
+           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;apply=yes \
-#           file://tosa/0018-Fix-the-pxa2xx_udc-to-balance-calls-to-clk_enable-cl.patch;apply=yes \
+#           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;apply=yes;status=external \
+	file://htcuni-acx.patch;status=external \
 	"
 
 SRC_URI_append_zylonite ="\
-	file://pxa_fb_overlay.patch;apply=yes \
-	file://zylonite-boot.patch;apply=yes \
+	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 b2eb94c..786a74e 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
@@ -20,37 +20,37 @@ DEFAULT_PREFERENCE_spitz = "1"
 # 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;apply=yes;name=rc4patch \
-           ${RPSRC}/lzo_jffs2_sysfs-r1.patch;apply=yes;name=rppatch1 \
-           ${RPSRC}/hx2750_base-r34.patch;apply=yes;name=rppatch2 \
-           ${RPSRC}/hx2750_bl-r9.patch;apply=yes;name=rppatch3 \
-           ${RPSRC}/hx2750_pcmcia-r3.patch;apply=yes;name=rppatch4 \
-           ${RPSRC}/pxa_keys-r9.patch;apply=yes;name=rppatch5 \
-           ${RPSRC}/tsc2101-r19.patch;apply=yes;name=rppatch6 \
-           ${RPSRC}/hx2750_test1-r8.patch;apply=yes;name=rppatch7 \
-           ${RPSRC}/sharpsl_pm_fixes1-r0.patch;apply=yes;name=rppatch8 \
-           ${RPSRC}/pm_changes-r1.patch;apply=yes;name=rppatch9 \
-           ${RPSRC}/locomo_kbd_tweak-r2.patch;apply=yes;name=rppatch10 \
-#           ${RPSRC}/pxa27x_overlay-r8.patch;apply=yes;name=rppatch11 \
-           ${RPSRC}/w100_extaccel-r2.patch;apply=yes;name=rppatch12 \
-           ${RPSRC}/w100_extmem-r1.patch;apply=yes;name=rppatch13 \
-           ${RPSRC}/poodle_pm-r6.patch;apply=yes;name=rppatch14 \
-           ${RPSRC}/poodle_lcd_hack-r0.patch;apply=yes;name=rppatch15 \
-           ${RPSRC}/poodle_asoc_fix-r1.patch;apply=yes;name=rppatch16 \
-           ${RPSRC}/logo_oh-r1.patch.bz2;apply=yes;status=unmergable;name=rppatch17 \
-           ${RPSRC}/pxa-linking-bug.patch;apply=yes;status=unmergable;name=rppatch18 \
-           file://hostap-monitor-mode.patch;apply=yes;status=unmergable \
-           file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;apply=yes;status=unmergable \
-           ${RPSRC}/mmcsd_large_cards-r1.patch;apply=yes;status=hack;name=rppatch19 \
-           ${RPSRC}/mmcsd_no_scr_check-r2.patch;apply=yes;status=hack;name=rppatch20 \
-           ${RPSRC}/integrator_rgb-r1.patch;apply=yes;status=hack;name=rppatch21 \
-           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;apply=yes;status=hack;name=rppatch22 \
-           file://sharpsl-rc-r1.patch;apply=yes \
-           file://spitz_h_rewrite.patch;apply=yes \
-           file://pxa-serial-hack.patch;apply=yes;status=hack \
-           file://connectplus-remove-ide-HACK.patch;apply=yes;status=hack \
-           file://connectplus-prevent-oops-HACK.patch;apply=yes;status=hack \
-           file://htcuni.patch;apply=yes \
-           file://versatile-armv6.patch;apply=yes \
+           ${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;apply=yes;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;apply=yes;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;apply=yes;name=rppatch52 \
+#            ${RPSRC}/usb_rndis_tweaks-r0.patch;name=rppatch52 \
 
 
 SRC_URI_append_collie = "\
-        ${TKSRC}/mtd-sharp-flash-hack-r4.patch;apply=yes;name=tkpatch1 \
-        ${TKSRC}/mcp-sa11x0-r0.patch;apply=yes;name=tkpatch2 \
-        ${TKSRC}/locomo-r1.patch;apply=yes;name=tkpatch3 \
-        ${TKSRC}/collie-kexec-r1.patch;apply=yes;name=tkpatch4 \
-        ${TKSRC}/sharpsl_pm-4.patch;apply=yes;name=tkpatch5 \
-        ${TKSRC}/collie_pm-3.patch;apply=yes;name=tkpatch6 \
-        ${TKSRC}/ucb1x00_suspend.patch;apply=yes;name=tkpatch7 \
-        ${TKSRC}/collie-ts.patch;apply=yes;name=tkpatch8 \
-        ${TKSRC}/pcmcia_suspend.patch;apply=yes;name=tkpatch9 \
-        ${TKSRC}/locomo_spi-6.patch;apply=yes;name=tkpatch10 \
-        ${TKSRC}/config.patch;apply=yes;name=tkpatch11 \
-	${TKSRC}/locomokeyb-2.patch;apply=yes;name=tkpatch17 \
-        ${TKSRC}/mmc-spi.patch;apply=yes;name=tkpatch12 \
-        ${TKSRC}/linux-2.6.24-SIMpad-rtc-sa1100.patch;apply=yes;name=tkpatch13 \
-        ${TKSRC}/sa1100_spinlock.patch;apply=yes;name=tkpatch14 \
-        ${TKSRC}/sa1100-dma.patch;apply=yes;name=tkpatch15 \
-	${TKSRC}/sa1100_udc_g_ether-2.patch;apply=yes;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;apply=yes;name=rppatch53 \
-           file://poodle_ts.patch;apply=yes \
-           file://pxafb.patch;apply=yes \
+           ${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;apply=yes \
-           file://tosa/0002-Modify-dma_alloc_coherent-on-ARM-so-that-it-supports.patch;apply=yes \
-           file://tosa/0003-Core-MFD-support.patch;apply=yes \
-           file://tosa/0004-Add-support-for-tc6393xb-MFD-core.patch;apply=yes \
-           file://tosa/0005-Add-support-for-tc6387xb-MFD-core.patch;apply=yes \
-           file://tosa/0006-Add-support-for-t7l66xb-MFD-core.patch;apply=yes \
-           file://tosa/0007-Common-headers-for-TMIO-MFD-subdevices.patch;apply=yes \
-           file://tosa/0008-Nand-driver-for-TMIO-devices.patch;apply=yes \
-           file://tosa/0009-FB-driver-for-TMIO-devices.patch;apply=yes \
-           file://tosa/0010-OHCI-driver-for-TMIO-devices.patch;apply=yes \
-           file://tosa/0011-MMC-driver-for-TMIO-devices.patch;apply=yes \
-           file://tosa/0012-Tosa-keyboard-support.patch;apply=yes \
-           file://tosa/0013-USB-gadget-pxa2xx_udc-supports-inverted-vbus.patch;apply=yes \
-           file://tosa/0014-tosa_udc_use_gpio_vbus.patch.patch;apply=yes \
-           file://tosa/0015-sharpsl-export-params.patch;apply=yes \
-           file://tosa/0016-This-patch-fixes-the-pxa25x-clocks-definitions-to-ad.patch;apply=yes \
-           file://tosa/0017-Convert-pxa2xx-UDC-to-use-debugfs.patch;apply=yes \
-           file://tosa/0018-Fix-the-pxa2xx_udc-to-balance-calls-to-clk_enable-cl.patch;apply=yes \
-           file://tosa/0026-I-don-t-think-we-should-check-for-IRQs-when-determin.patch;apply=yes \
-           file://tosa/0027-Add-LiMn-one-of-the-most-common-for-small-non-recha.patch;apply=yes \
-           file://tosa/0028-Add-suspend-resume-wakeup-support-for-pda_power.patch;apply=yes \
-           file://tosa/0029-Support-using-VOLTAGE_-properties-for-apm-calculati.patch;apply=yes \
-           file://tosa/0030-Core-driver-for-WM97xx-touchscreens.patch;apply=yes \
-           file://tosa/0031-Add-chip-driver-for-WM9705-touchscreen.patch;apply=yes \
-           file://tosa/0032-Add-chip-driver-for-WM9712-touchscreen.patch;apply=yes \
-           file://tosa/0033-Add-chip-driver-for-WM9713-touchscreen.patch;apply=yes \
-           file://tosa/0034-Driver-for-WM97xx-touchscreens-in-streaming-mode-on.patch;apply=yes \
-           file://tosa/0035-Build-system-and-MAINTAINERS-entry-for-WM97xx-touchs.patch;apply=yes \
-           file://tosa/0036-Set-id-to-1-for-wm97xx-subdevices.patch;apply=yes \
-           file://tosa/0037-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch;apply=yes \
-           file://tosa/0038-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch;apply=yes \
-           file://tosa/0044-fix-tmio_mmc-debug-compilation.patch;apply=yes \
-           file://tosa/0045-Update-tmio_ohci.patch;apply=yes \
-           file://tosa/0046-patch-tc6393xb-cleanup.patch;apply=yes \
-           file://tosa/0047-tc6393xb-use-bitmasks-instead-of-bit-field-structs.patch;apply=yes \
-           file://tosa/0048-tc6393xb-GPIO-support.patch;apply=yes \
-           file://tosa/0049-platform-support-for-TMIO-on-tosa.patch;apply=yes \
-           file://tosa/0050-tosa-update-for-tc6393xb-gpio.patch;apply=yes \
-           file://tosa/0051-fix-sound-soc-pxa-tosa.c-to-new-gpio-api.patch;apply=yes \
-           file://tosa/0052-tosa-platform-backlight-support.patch;apply=yes \
-           file://tosa/0053-sound-soc-codecs-wm9712.c-28.patch;apply=yes \
-           file://tosa/0054-sound-soc-codecs-wm9712.c-2.patch;apply=yes \
-           file://tosa/0055-Add-GPIO_POWERON-to-the-list-of-devices-that-we-supp.patch;apply=yes \
-           file://tosa/0058-Fix-tosakbd-suspend.patch;apply=yes \
-           file://tosa/0059-patch-tosa-wakeup-test.patch;apply=yes \
-           file://tosa/0060-Add-support-for-power_supply-on-tosa.patch;apply=yes \
-           file://tosa/0061-tosa-bat-unify.patch;apply=yes \
-           file://tosa/0062-tosa-bat-fix-charging.patch;apply=yes \
-           file://tosa/0063-patch-tosa-bat-jacket-detect.patch;apply=yes \
-           file://tosa/0064-Export-modes-via-sysfs.patch;apply=yes \
-           file://tosa/0065-wm97xx-core-fixes.patch;apply=yes \
-           file://tosa/0066-tmiofb_probe-should-be-__devinit.patch;apply=yes \
-           file://tosa/0067-modeswitching.patch;apply=yes \
-           file://tosa/0068-Preliminary-tosa-denoiser.patch;apply=yes \
-           file://tosa/0019-pxa-remove-periodic-mode-emulation-support.patch;apply=yes \
-           file://tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch;apply=yes \
-           file://tosa/0021-Add-an-empty-drivers-gpio-directory-for-gpiolib-infr.patch;apply=yes \
-           file://tosa/0022-Provide-new-implementation-infrastructure-that-platf.patch;apply=yes \
-           file://tosa/0023-This-adds-gpiolib-support-for-the-PXA-architecture.patch;apply=yes \
-           file://tosa/0024-Update-Documentation-gpio.txt-primarily-to-include.patch;apply=yes \
-           file://tosa/0025-Signed-off-by-Dmitry-Baryshkov-dbaryshkov-gmail.co.patch;apply=yes \
-           file://tosa/0039-Add-generic-framework-for-managing-clocks.patch;apply=yes \
-           file://tosa/0040-Clocklib-debugfs-support.patch;apply=yes \
-           file://tosa/0041-From-80a359e60c2aec59ccf4fca0a7fd20495f82b1d2-Mon-Se.patch;apply=yes \
-           file://tosa/0042-Use-correct-clock-for-IrDA-on-pxa.patch;apply=yes \
-           file://tosa/0043-Use-clocklib-for-sa1100-sub-arch.patch;apply=yes \
-           file://tosa/0056-Support-resetting-by-asserting-GPIO-pin.patch;apply=yes \
-           file://tosa/0057-Clean-up-tosa-resetting.patch;apply=yes \
+           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;apply=yes;status=external \
+	file://htcuni-acx.patch;status=external \
 	"
 
 SRC_URI_append_zylonite ="\
-	file://pxa_fb_overlay.patch;apply=yes \
-	file://zylonite-boot.patch;apply=yes \
-	file://zylonite_mtd-r0.patch;apply=yes \
-	file://zylonite_touch-r0.patch;apply=yes \
-	file://zylonite_keypad-r0.patch;apply=yes \
+	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 42d04a6..240ae95 100644
--- a/recipes/linux/linux-rp_2.6.26.bb
+++ b/recipes/linux/linux-rp_2.6.26.bb
@@ -22,39 +22,39 @@ DEFAULT_PREFERENCE_c7x0 = "1"
 # 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;apply=yes;name=rppatch1 \
-           ${RPSRC}/hx2750_base-r34.patch;apply=yes;name=rppatch2 \
-           ${RPSRC}/hx2750_bl-r9.patch;apply=yes;name=rppatch3 \
-           ${RPSRC}/hx2750_pcmcia-r3.patch;apply=yes;name=rppatch4 \
-           ${RPSRC}/pxa_keys-r9.patch;apply=yes;name=rppatch5 \
-           ${RPSRC}/tsc2101-r19.patch;apply=yes;name=rppatch6 \
-           ${RPSRC}/hx2750_test1-r8.patch;apply=yes;name=rppatch7 \
-           ${RPSRC}/sharpsl_pm_fixes1-r0.patch;apply=yes;name=rppatch8 \
-           ${RPSRC}/pm_changes-r1.patch;apply=yes;name=rppatch9 \
-           ${RPSRC}/locomo_kbd_tweak-r2.patch;apply=yes;name=rppatch10 \
-#           ${RPSRC}/pxa27x_overlay-r8.patch;apply=yes;name=rppatch11 \
-           ${RPSRC}/w100_extaccel-r2.patch;apply=yes;name=rppatch12 \
-           ${RPSRC}/w100_extmem-r1.patch;apply=yes;name=rppatch13 \
-#           ${RPSRC}/poodle_pm-r6.patch;apply=yes;name=rppatch14 \
-           file://poodle_pm-r7.patch;apply=yes;name=rppatch14 \
-           ${RPSRC}/poodle_lcd_hack-r0.patch;apply=yes;name=rppatch15 \
-           ${RPSRC}/poodle_asoc_fix-r1.patch;apply=yes;name=rppatch16 \
-           file://zaurus-i2c-init.patch;apply=yes;status=upstream \
-#           ${RPSRC}/logo_oh-r1.patch.bz2;apply=yes;status=unmergable;name=rppatch17 \
-           ${RPSRC}/pxa-linking-bug.patch;apply=yes;status=unmergable;name=rppatch18 \
-           file://hostap-monitor-mode.patch;apply=yes;status=unmergable \
-           file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;apply=yes;status=unmergable \
-           ${RPSRC}/mmcsd_large_cards-r1.patch;apply=yes;status=hack;name=rppatch19 \
-           ${RPSRC}/mmcsd_no_scr_check-r2.patch;apply=yes;status=hack;name=rppatch20 \
-           ${RPSRC}/integrator_rgb-r1.patch;apply=yes;status=hack;name=rppatch21 \
-           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;apply=yes;status=hack;name=rppatch22 \
-           file://sharpsl-rc-r1.patch;apply=yes \
-           file://spitz_h_rewrite.patch;apply=yes \
-           file://pxa-serial-hack.patch;apply=yes;status=hack \
-           file://connectplus-remove-ide-HACK.patch;apply=yes;status=hack \
-           file://connectplus-prevent-oops-HACK.patch;apply=yes;status=hack \
-           file://htcuni.patch;apply=yes \
-           file://versatile-armv6.patch;apply=yes \
+           ${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 \
@@ -71,110 +71,110 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2;name=k
 
 
 # FIXMEs before made default	   
-# ${RPSRC}/mmcsd_no_scr_check-r1.patch;apply=yes;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;apply=yes;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;apply=yes;name=rppatch52 \
+#            ${RPSRC}/usb_rndis_tweaks-r0.patch;name=rppatch52 \
 
 
 SRC_URI_append_collie = "\
-	file://collie.patch;apply=yes \
-	file://collie_keymap.patch;apply=yes \
-	file://collie-ucbfix.patch;apply=yes \
-	file://usb-gadget27bp.patch;apply=yes \
+	file://collie.patch \
+	file://collie_keymap.patch \
+	file://collie-ucbfix.patch \
+	file://usb-gadget27bp.patch \
 "
 
 SRC_URI_append_poodle = "\
-           file://poodle_serial_vcc-r1.patch;apply=yes \
-#           file://poodle_ts.patch;apply=yes \
-#           file://pxafb.patch;apply=yes \
+           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;apply=yes \
-           file://tosa/0002-Modify-dma_alloc_coherent-on-ARM-so-that-it-supports.patch;apply=yes \
-           file://tosa/0003-Core-MFD-support.patch;apply=yes \
-           file://tosa/0004-Add-support-for-tc6393xb-MFD-core.patch;apply=yes \
-           file://tosa/0005-Add-support-for-tc6387xb-MFD-core.patch;apply=yes \
-           file://tosa/0006-Add-support-for-t7l66xb-MFD-core.patch;apply=yes \
-           file://tosa/0007-Common-headers-for-TMIO-MFD-subdevices.patch;apply=yes \
-           file://tosa/0008-Nand-driver-for-TMIO-devices.patch;apply=yes \
-           file://tosa/0009-FB-driver-for-TMIO-devices.patch;apply=yes \
-           file://tosa/0010-OHCI-driver-for-TMIO-devices.patch;apply=yes \
-           file://tosa/0011-MMC-driver-for-TMIO-devices.patch;apply=yes \
-           file://tosa/0012-Tosa-keyboard-support.patch;apply=yes \
-           file://tosa/0013-USB-gadget-pxa2xx_udc-supports-inverted-vbus.patch;apply=yes \
-           file://tosa/0014-tosa_udc_use_gpio_vbus.patch.patch;apply=yes \
-           file://tosa/0015-sharpsl-export-params.patch;apply=yes \
-           file://tosa/0016-This-patch-fixes-the-pxa25x-clocks-definitions-to-ad.patch;apply=yes \
-           file://tosa/0017-Convert-pxa2xx-UDC-to-use-debugfs.patch;apply=yes \
-           file://tosa/0018-Fix-the-pxa2xx_udc-to-balance-calls-to-clk_enable-cl.patch;apply=yes \
-           file://tosa/0026-I-don-t-think-we-should-check-for-IRQs-when-determin.patch;apply=yes \
-           file://tosa/0027-Add-LiMn-one-of-the-most-common-for-small-non-recha.patch;apply=yes \
-           file://tosa/0028-Add-suspend-resume-wakeup-support-for-pda_power.patch;apply=yes \
-           file://tosa/0029-Support-using-VOLTAGE_-properties-for-apm-calculati.patch;apply=yes \
-           file://tosa/0030-Core-driver-for-WM97xx-touchscreens.patch;apply=yes \
-           file://tosa/0031-Add-chip-driver-for-WM9705-touchscreen.patch;apply=yes \
-           file://tosa/0032-Add-chip-driver-for-WM9712-touchscreen.patch;apply=yes \
-           file://tosa/0033-Add-chip-driver-for-WM9713-touchscreen.patch;apply=yes \
-           file://tosa/0034-Driver-for-WM97xx-touchscreens-in-streaming-mode-on.patch;apply=yes \
-           file://tosa/0035-Build-system-and-MAINTAINERS-entry-for-WM97xx-touchs.patch;apply=yes \
-           file://tosa/0036-Set-id-to-1-for-wm97xx-subdevices.patch;apply=yes \
-           file://tosa/0037-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch;apply=yes \
-           file://tosa/0038-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch;apply=yes \
-           file://tosa/0044-fix-tmio_mmc-debug-compilation.patch;apply=yes \
-           file://tosa/0045-Update-tmio_ohci.patch;apply=yes \
-           file://tosa/0046-patch-tc6393xb-cleanup.patch;apply=yes \
-           file://tosa/0047-tc6393xb-use-bitmasks-instead-of-bit-field-structs.patch;apply=yes \
-           file://tosa/0048-tc6393xb-GPIO-support.patch;apply=yes \
-           file://tosa/0049-platform-support-for-TMIO-on-tosa.patch;apply=yes \
-           file://tosa/0050-tosa-update-for-tc6393xb-gpio.patch;apply=yes \
-           file://tosa/0051-fix-sound-soc-pxa-tosa.c-to-new-gpio-api.patch;apply=yes \
-           file://tosa/0052-tosa-platform-backlight-support.patch;apply=yes \
-           file://tosa/0053-sound-soc-codecs-wm9712.c-28.patch;apply=yes \
-           file://tosa/0054-sound-soc-codecs-wm9712.c-2.patch;apply=yes \
-           file://tosa/0055-Add-GPIO_POWERON-to-the-list-of-devices-that-we-supp.patch;apply=yes \
-           file://tosa/0058-Fix-tosakbd-suspend.patch;apply=yes \
-           file://tosa/0059-patch-tosa-wakeup-test.patch;apply=yes \
-           file://tosa/0060-Add-support-for-power_supply-on-tosa.patch;apply=yes \
-           file://tosa/0061-tosa-bat-unify.patch;apply=yes \
-           file://tosa/0062-tosa-bat-fix-charging.patch;apply=yes \
-           file://tosa/0063-patch-tosa-bat-jacket-detect.patch;apply=yes \
-           file://tosa/0064-Export-modes-via-sysfs.patch;apply=yes \
-           file://tosa/0065-wm97xx-core-fixes.patch;apply=yes \
-           file://tosa/0066-tmiofb_probe-should-be-__devinit.patch;apply=yes \
-           file://tosa/0067-modeswitching.patch;apply=yes \
-           file://tosa/0068-Preliminary-tosa-denoiser.patch;apply=yes \
-           file://tosa/0019-pxa-remove-periodic-mode-emulation-support.patch;apply=yes \
-           file://tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch;apply=yes \
-           file://tosa/0021-Add-an-empty-drivers-gpio-directory-for-gpiolib-infr.patch;apply=yes \
-           file://tosa/0022-Provide-new-implementation-infrastructure-that-platf.patch;apply=yes \
-           file://tosa/0023-This-adds-gpiolib-support-for-the-PXA-architecture.patch;apply=yes \
-           file://tosa/0024-Update-Documentation-gpio.txt-primarily-to-include.patch;apply=yes \
-           file://tosa/0025-Signed-off-by-Dmitry-Baryshkov-dbaryshkov-gmail.co.patch;apply=yes \
-           file://tosa/0039-Add-generic-framework-for-managing-clocks.patch;apply=yes \
-           file://tosa/0040-Clocklib-debugfs-support.patch;apply=yes \
-           file://tosa/0041-From-80a359e60c2aec59ccf4fca0a7fd20495f82b1d2-Mon-Se.patch;apply=yes \
-           file://tosa/0042-Use-correct-clock-for-IrDA-on-pxa.patch;apply=yes \
-           file://tosa/0043-Use-clocklib-for-sa1100-sub-arch.patch;apply=yes \
-           file://tosa/0056-Support-resetting-by-asserting-GPIO-pin.patch;apply=yes \
-           file://tosa/0057-Clean-up-tosa-resetting.patch;apply=yes \
+           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;apply=yes;status=external \
+	file://htcuni-acx.patch;status=external \
 	"
 
 SRC_URI_append_zylonite ="\
-	file://pxa_fb_overlay.patch;apply=yes \
-	file://zylonite-boot.patch;apply=yes \
-	file://zylonite_mtd-r0.patch;apply=yes \
-	file://zylonite_touch-r0.patch;apply=yes \
-	file://zylonite_keypad-r0.patch;apply=yes \
+	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 0ac3d80..d256400 100644
--- a/recipes/linux/linux-rt_2.6.24.bb
+++ b/recipes/linux/linux-rt_2.6.24.bb
@@ -10,20 +10,20 @@ 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;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;apply=yes \
-           file://powerpc-clockres.patch;apply=yes \
+           file://squashfs-lzma-2.6.24.patch \
+           file://powerpc-clockres.patch \
            file://defconfig"
 
-#           file://sysctl_missing_include.patch;apply=yes \
+#           file://sysctl_missing_include.patch \
 
 S = "${WORKDIR}/linux-2.6.24"
 
 SRC_URI_append_mpc8313e-rdb = " \
-           file://leds-cpu-activity.patch;apply=yes \
-           file://leds-cpu-activity-powerpc.patch;apply=yes \
-           file://mpc8313e-rdb-leds.patch;apply=yes"
-#	file://mpc831x-nand.patch;apply=yes \
-#	file://mpc8313e-rdb-rtc.patch;apply=yes "
+           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
@@ -38,36 +38,36 @@ 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;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;apply=yes \
-file://powerpc-clockres.patch;apply=yes \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-platform-support.patch;apply=yes;name=patchmpc1 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-add-all-interrupts.patch;apply=yes;name=patchmpc2 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-Realtek-821x-phy.patch;apply=yes;name=patchmpc3 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-fix-gianfar.patch;apply=yes;name=patchmpc4 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-Gianfar-buffer-recycling.patch;apply=yes;name=patchmpc5 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-Gianfar-performance.patch;apply=yes;name=patchmpc6 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-sata-support.patch;apply=yes;name=patchmpc7 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-fsl-serdes-support.patch;apply=yes;name=patchmpc8 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-pcie-INTx-support.patch;apply=yes;name=patchmpc9 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-ipic-msi.patch;apply=yes;name=patchmpc10 \ 
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-usb-support.patch;apply=yes;name=patchmpc11 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-power-management.patch;apply=yes;name=patchmpc12 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-usb-power-mangement.patch;apply=yes;name=patchmpc13 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-NAND-flash.patch;apply=yes;name=patchmpc14 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-elbc-jffs2-on-nand.patch;apply=yes;name=patchmpc15 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-Codewarrior-kernel-debug.patch;apply=yes;name=patchmpc16 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-otg.patch;apply=yes;name=patchmpc17 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC831x-LFC.patch;apply=yes;name=patchmpc18 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-TDM.patch;apply=yes;name=patchmpc19 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-tdm-test-modules.patch;apply=yes;name=patchmpc20 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-spi-for-tdm-module.patch;apply=yes;name=patchmpc21 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-port-mutiplier-in-sata.patch;apply=yes;name=patchmpc22 \ 
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-performance-monitor.patch;apply=yes;name=patchmpc23 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-ieee-1588.patch;apply=yes;name=patchmpc24 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-DTS.patch;apply=yes;name=patchmpc25 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-sata-pm.patch;apply=yes;name=patchmpc26 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-fix-large-file-transfer.patch;apply=yes;name=patchmpc27 \
-http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-default-configuration.patch;apply=yes;name=patchmpc28 \
+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;apply=yes;name=patchmpc29 \
-#http://www.bitshrine.org/gpp/ocf-linux-20071215-20080427.diff;apply=yes;name=patchmpc30 \
-#http://www.bitshrine.org/gpp/linux-fsl-2.6.24-OCF-fsl_soc-2.patch;apply=yes;name=patchmpc31 \
-#http://www.bitshrine.org/gpp/linux-2.6.24-Openswan-2.4.12.patch;apply=yes;name=patchmpc32 \
-#http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-openswan-sysctl.patch;apply=yes;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-sgh-i900_2.6.32.bb b/recipes/linux/linux-sgh-i900_2.6.32.bb
index 23913e8..f45da3f 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;apply=yes \
+           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 c291c0c..f8ec93f 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;apply=yes \
+           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 fe4b3b5..aeaa089 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;apply=yes \
-           file://0021-Add-Neo1973-ASoC-support.patch;apply=yes \
-           file://0022-Add-initial-ASoC-SMDK2440-support.patch;apply=yes \
-           file://0023-Add-ASoC-SMDK2440-support-for-WM8956-codec.patch;apply=yes \
-           file://0034-Export-ac97_dai.patch;apply=yes \
-           file://0036-Move-s3c24xx_i2s_dai-and-add-dma_size.patch;apply=yes \
-           file://0037-Use-dma_size-parameter-and-fix-buffdone-oops.patch;apply=yes \
-           file://0038-Add-smdk2443-s3c2443-ac97-and-wm9710-support.patch;apply=yes \
-           file://asoc-mainline.patch;apply=yes \
+           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 209c3c0..dd606a2 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;apply=yes \
+           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 649816c..623ca1f 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;apply=yes \
-	   file://titan-pcibios-scan-update.patch;apply=yes \
-           file://no-mm-mutex.patch;apply=yes \
-	   file://linux-2.6-limits.patch;apply=yes \
-	   file://linux-sh-__sdivsi3_i4i.patch;apply=yes \
+	   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 d986209..bea99a7 100644
--- a/recipes/linux/linux-tornado-omap2_2.6.16.16.bb
+++ b/recipes/linux/linux-tornado-omap2_2.6.16.16.bb
@@ -5,8 +5,8 @@ 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;apply=yes;name=patch \
-           file://linux-2.6.16.16.patch;apply=yes \
-           file://tornado-20070320.patch;apply=yes \
+           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 e64662e..355ca00 100644
--- a/recipes/linux/linux-turbostation_2.6.20.2.bb
+++ b/recipes/linux/linux-turbostation_2.6.20.2.bb
@@ -9,9 +9,9 @@ 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;apply=yes \
+	file://001_r1000.diff \
 	file://linux-2.6.16_arch_ppc_platforms_sandpoint.h;apply=yes \
-	file://002_qnap-pic.diff;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 \
diff --git a/recipes/linux/linux-wrt_2.4.20.bb b/recipes/linux/linux-wrt_2.4.20.bb
index 57d9d60..30deb51 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;apply=yes \
-	   file://2.4.20_broadcom_3_37_2_1109_US.patch;apply=yes \
-	   file://110-sch_htb.patch;apply=yes \
-	   file://120-openwrt.patch;apply=yes \
-	   file://130-nfsswap.patch;apply=yes \
-	   file://140-ebtables-brnf-5.patch;apply=yes \
-	   file://150-mppe-mppc-0.98.patch;apply=yes \
-	   file://160-expr.patch;apply=yes \
-	   file://linux-2.4.24-attribute-used.patch;apply=yes \
-	   file://gcc_mtune.patch;apply=yes \
-	   file://gcc3.patch;apply=yes \
-	   file://nobcom.patch;apply=yes \
+	   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 05253f9..40171c1 100644
--- a/recipes/linux/linux-wrt_2.4.30.bb
+++ b/recipes/linux/linux-wrt_2.4.30.bb
@@ -9,7 +9,7 @@ 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;apply=yes \
+	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 \
@@ -34,13 +34,13 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-2.4.30.tar.bz2;name=k
 	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;apply=yes \
-	file://201-include_linux_skbuff_h.patch;apply=yes \
-	file://202-net_core_Makefile.patch;apply=yes \
-	file://203-net_core_dev_c.patch;apply=yes \
-	file://204-net_sched_sched_api_c.patch;apply=yes \
-	file://205-net_sched_sched_generic_c.patch;apply=yes \
-	file://206-include_net_pkt_sched_h.patch;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 \
@@ -50,21 +50,21 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-2.4.30.tar.bz2;name=k
 	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;apply=yes \
+	file://307-gcc-3.4-fix.patch \
 	file://308-netfilter-nat-pptp;apply=yes \
-	file://309-drivers_net_b44_c.patch;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;apply=yes \
-	file://315-include_linux_pci_ids_h.patch;apply=yes \
-	file://316-b44_mii_phy.patch;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;apply=yes \
-	file://404-netdev_random_et.patch;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"
diff --git a/recipes/linux/linux-xxs1500_2.4.21.bb b/recipes/linux/linux-xxs1500_2.4.21.bb
index ff17830..ec51b85 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;apply=yes;striplevel=0"
+	file://zboot-Makefile-flags.diff;striplevel=0"
 
 S = "${WORKDIR}/linux"
 
diff --git a/recipes/linux/linux_2.6.14.bb b/recipes/linux/linux_2.6.14.bb
index 8e60978..a635230 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;apply=yes;name=patch1 \
-           http://rtp-net.org/ipaq/patches/2.6.14-3/full.patch;apply=yes;name=patch2 \
-           file://n30-cleanup.patch;apply=yes \
-           file://n35.patch;apply=yes \
-           file://n30-lcd.patch;apply=yes \
-           file://n30-backlight.patch;apply=yes \
-           file://n30-ts.patch;apply=yes \
-           file://n30-buttons.patch;apply=yes \
-           file://n30-mmc.patch;apply=yes \
-           file://n30-mmc-power.patch;apply=yes \
-           file://n30-mmc-wprotect.patch;apply=yes \
-           file://n30-nand.patch;apply=yes \
-           file://n30-usbstart.patch;apply=yes \
-           file://n30-hardcode.patch;apply=yes \
-           file://n30-apm.patch;apply=yes \
-           file://s3c2410fb-resume.patch;apply=yes \
-           file://s3c2410_ts-pm.patch;apply=yes \
+           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;apply=yes \
-           file://s3c2410-nand-pm.patch;apply=yes \
-           file://n30-nand-hack.patch;apply=yes \
-           file://mmc-plus.patch;apply=yes \
-           file://gpio-sysfs.patch;apply=yes \
-           file://regdump.patch;apply=yes \
-           file://n30-pm.patch;apply=yes \
-           file://spi.patch;apply=yes \
-           file://wingel-hacking.patch;apply=yes \
-           file://gcc4-fixes.patch;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 8582436..e66fc6d 100644
--- a/recipes/linux/linux_2.6.18.bb
+++ b/recipes/linux/linux_2.6.18.bb
@@ -16,93 +16,93 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=ke
            " 
 
 SRC_URI_append_avr32 = " \
-           file://atmel-version.patch;apply=yes \
-           file://add-flush_buffer-operation-to-uart_ops.patch;apply=yes \
-           file://kbuild-add-unifdef.patch;apply=yes \
-           file://kbuild-replace-use-of-strlcpy-with-a-dedicated-implmentation-in-unifdef.patch;apply=yes \
-           file://kbuild-use-in-kernel-unifdef.patch;apply=yes \
-           file://spi-set-kset-of-master-class-dev-explicitly.patch;apply=yes \
-           file://spi-fix-spi-busnum-to-master-buffer-and-bus_num-0.patch;apply=yes \
-           file://usb-ethernet-align-all-descriptors-on-a-word-boundary.patch;apply=yes \
-           file://usb-ethernet-define-cdc-capability-for-husb2.patch;apply=yes \
-           file://usb-file-storage-align-all-descriptors-on-a-word-boundary.patch;apply=yes \
-           file://usb-serial-align-all-descriptors-on-a-word-boundary.patch;apply=yes \
-           file://usb-zero-align-all-descriptors-on-a-word-boundary.patch;apply=yes \
-           file://dont-include-map-h-from-physmap-h.patch;apply=yes \
-           file://mtd-unlock-nor-flash-automatically-where-necessary.patch;apply=yes \
-           file://avr32-arch.patch;apply=yes \
-           file://avr32-dont-include-asm-delay-h.patch;apply=yes \
-           file://avr32-unistd-h-move-ifdef-kernel.patch;apply=yes \
-           file://avr32-checkstack.patch;apply=yes \
-           file://avr32-oprofile.patch;apply=yes \
-           file://avr32-drop-GFP_COMP-for-DMA-memory-allocations.patch;apply=yes \
-           file://avr32-move-ethernet-tag-parsing-to-board-specific-code.patch;apply=yes \
-           file://avr32-dma-controller-framework.patch;apply=yes \
-           file://avr32-arch-neutral-gpio-api.patch;apply=yes \
-           file://add-mach-specific-kconfig.patch;apply=yes \
-           file://avr32-gpio-dev.patch;apply=yes \
-           file://atmel-usart3-driver.patch;apply=yes \
-           file://atmel-macb-ethernet-driver.patch;apply=yes \
-           file://at32ap7000-dmac-driver.patch;apply=yes \
-           file://atmel-mmc-host-driver.patch;apply=yes \
-           file://atmel-spi-master-driver.patch;apply=yes \
-           file://atmel-twi-driver.patch;apply=yes \
-           file://atmel-lcdc-framebuffer-driver.patch;apply=yes \
-           file://lcdc-wait-for-vsync.patch;apply=yes \
-           file://ltv350qv-lcd-driver.patch;apply=yes \
-           file://atmel-husb2-udc-driver.patch;apply=yes \
-           file://avr32-sound.patch;apply=yes \
-           file://atmel-ac97c-alsa-driver.patch;apply=yes \
-           file://at73c213-alsa-driver.patch;apply=yes \
-           file://at32-dac-oss-driver.patch;apply=yes \
-           file://renumber-usart-devices.patch;apply=yes \
-           file://rename-ttyUS-to-ttyS-or-ttyAT.patch;apply=yes \
-           file://at32-dac-oss-driver-clk-fix.patch;apply=yes \
-           file://add-all-parameters-to-smc-driver.patch;apply=yes \
-           file://at32ap7000-platform_device-definitions.patch;apply=yes \
-           file://atstk1000-instantiate-devices.patch;apply=yes \
-           file://add-hmatrix-support.patch;apply=yes \
-           file://add-ide-header.patch;apply=yes \
-           file://avr32-network-gateway-support.patch;apply=yes \
-           file://ngw-fix-usart-initialization.patch;apply=yes \
-           file://avr32-little-endian-read-write-bwl.patch;apply=yes \
-           file://gpio-dev-robustness.patch;apply=yes \
-           file://add-intc_pending_irq-to-intc.patch;apply=yes \
-           file://update-atstk1002_defconfig.patch;apply=yes \
-           file://fix-usart3-rx-BUG.patch;apply=yes \
-           file://fix-lcd-display-off-by-two-problem.patch;apply=yes \
-           file://fix-alpha-color-bitfield.patch;apply=yes \
-           file://jffs2_can_mark_obsolete-should-return-0-for-dataflash.patch;apply=yes \
-           file://mtd-fix-atmel-pri-for-cmdset-0001-and-cmdset-0002.patch;apply=yes \
-           file://fix-gpio-prototypes.patch;apply=yes \
-           file://pio-deglitch.patch;apply=yes \
-           file://pio-interrupt-controller.patch;apply=yes \
-           file://gpio-dev-blocking-read.patch;apply=yes \
-           file://add-default-atngw-defconfig.patch;apply=yes \
-           file://gpio-define-pio-none.patch;apply=yes \
-           file://mmc-add-platform-data.patch;apply=yes \
-           file://ngw100-change-spi-clock-on-dataflash.patch;apply=yes \
-           file://atstk1000-add-platform-data-for-mmc.patch;apply=yes \
-           file://avr32-increment-pointer-when-parsing-for-fbmem_start.patch;apply=yes \
-           file://lcdc-do-not-clear-mem-if-fbmem_start-is-set.patch;apply=yes \
-           file://avr32-fix-oprofile-interrupts.patch;apply=yes \
-           file://avr32-time-add-shared-interrupts.patch;apply=yes \
-           file://usart-make-rx-timeout-baudrate-independent.patch;apply=yes \
-           file://spi-reduce-dlybs-and-dlybct.patch;apply=yes \
-           file://dmac-stopping-idle-channel-is-not-fatal.patch;apply=yes \
-           file://mmc-core-dma-fix.patch;apply=yes \
-           file://atstk1000-board-fix-fbmem-setup.patch;apply=yes \
-           file://lcdc-fix-possible-null-pointer-and-match-guard-time-to-uboot.patch;apply=yes \
-           file://ltv350qv-add-initial_power_state-param.patch;apply=yes \
-           file://atmel-mci-debugfs.patch;apply=yes \
-           file://dmac-add-explicit-blockcount-to-dma_request_sg.patch;apply=yes \
-           file://atmel-mci-init-nr_blocks-in-dma-request.patch;apply=yes \
-           file://mmc-add-bit-manipulating-macros.patch;apply=yes \
-           file://mmc-add-detect-card-and-wp-support.patch;apply=yes \
-           file://atmel_spi-handle-rx-overrun.patch;apply=yes \
-           file://atmel_spi-send-zeroes-when-tx_buf-is-not-set.patch;apply=yes \
-           file://husb2_udc-test-mode.patch;apply=yes \
-           file://0001-AVR32-Fix-compile-error-with-gcc-4.1.patch;apply=yes \
+           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 87c1dca..bc047d6 100644
--- a/recipes/linux/linux_2.6.20.bb
+++ b/recipes/linux/linux_2.6.20.bb
@@ -10,35 +10,35 @@ 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;apply=yes;name=stablepatch \
-	   file://0001-kbuild-include-limits.h-in-sumversion.c-for-PATH_MAX.patch;apply=yes \
+	   file://0001-kbuild-include-limits.h-in-sumversion.c-for-PATH_MAX.patch \
            file://defconfig"
 
 SRC_URI_append_n2100 = "\
-	   file://n2100-r8169-parity.patch;apply=yes \
-	   file://rtc-rs5c372-n2100.patch;apply=yes \
+	   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;apply=yes;name=at91patch \
-                                 http://www.at91.com/repFichier/Project-217/linux-${PV}-at91-exp.diff.bz2;apply=yes;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;apply=yes;name=at91patch \
-                                 http://www.at91.com/repFichier/Project-217/linux-${PV}-at91-exp.diff.bz2;apply=yes;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;apply=yes;name=at91patch \
-                                 http://www.at91.com/repFichier/Project-217/linux-${PV}-at91-exp.diff.bz2;apply=yes;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;apply=yes \
-		file://audio_codec_patch_base_v5.6.0.patch;apply=yes \
-		file://linux-2.6.20_01_dec_2.patch;apply=yes \
-		file://patch_classdamp_pm_v_audio_codec_patch.patch;apply=yes \
-		file://patch_audiocodec_glitch.patch;apply=yes \
-		file://hrw-saa-fix.diff;apply=yes \
-		file://hrw-make-create-kconfig-executable.patch;apply=yes \
+		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 90ffa04..0e2ac80 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
@@ -14,16 +14,16 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2;name=k
 	   "
 
 SRC_URI_append_simpad = "\
-           file://linux-2.6.21-SIMpad-cs3-simpad.patch;apply=yes \
-           file://linux-2.6.21-SIMpad-mq200.patch;apply=yes \
-           file://linux-2.6.21-SIMpad-serial-and-gpio_keys.patch;apply=yes \
-           file://linux-2.6.21-SIMpad-ucb1x00-switches.patch;apply=yes \
-           file://linux-2.6.21-pcmcia-device-to-platform-driver.patch;apply=yes \
+           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;apply=yes;name=at91patch \
-                          file://at91-mmcfix.patch;apply=yes"
-SRC_URI_append_at91sam9263ek = " http://maxim.org.za/AT91RM9200/2.6/2.6.22-rc1-at91.patch.gz;apply=yes;name=at91patch \
-                                 file://at91-mmcfix.patch;apply=yes"
+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 0ea4231..4aefbd1 100644
--- a/recipes/linux/linux_2.6.21.bb
+++ b/recipes/linux/linux_2.6.21.bb
@@ -10,72 +10,72 @@ 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;apply=yes;name=stablepatch \
            file://tsc2003.c \
-	   file://tsc2003-config.diff;apply=yes \
+	   file://tsc2003-config.diff \
 	   file://defconfig \
 	   "
 
 SRC_URI_append_simpad = "\
-           file://linux-2.6.21-SIMpad-cs3-simpad.patch;apply=yes \
-           file://linux-2.6.21-SIMpad-mq200.patch;apply=yes \
-           file://linux-2.6.21-SIMpad-serial-gpio_keys-and-cs3-ro.patch;apply=yes \
-           file://linux-2.6.21-SIMpad-ucb1x00-switches.patch;apply=yes \
-	   file://linux-2.6.21-SIMpad-pcmcia.patch;apply=yes \
-	   file://linux-2.6.21-SIMpad-net-shared-irq.patch;apply=yes \
-	   file://linux-2.6.21-SIMpad-ucb1x00-ts-supend-and-accuracy.patch;apply=yes \
-           file://linux-2.6.21-SIMpad-GPIO-MMC-mod.patch;apply=yes \
-	   file://linux-2.6.21-SIMpad-battery-old-way-but-also-with-sysfs.patch;apply=yes \
-	   file://linux-2.6.21-SIMpad-usb-gadget.patch;apply=yes \
+           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;apply=yes;name=at91patch "
-SRC_URI_append_at91sam9263ek = " http://maxim.org.za/AT91RM9200/2.6/2.6.21-at91.patch.gz;apply=yes;name=at91patch "
-SRC_URI_append_sarge-at91 = " http://maxim.org.za/AT91RM9200/2.6/2.6.21-at91.patch.gz;apply=yes;name=at91patch \
-                              file://2.6.21-sarge-kernel.patch;apply=yes \
-                              file://2.6.21-sarge-phy.patch;apply=yes \
-                              file://2.6.21-sarge-mmc.patch;apply=yes"
+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;apply=yes \
-       file://header.patch;apply=yes \
-       file://arch-config.patch;apply=yes \
-       file://board-init.patch;apply=yes \
-       file://compact-flash.patch;apply=yes \
-       file://flash.patch;apply=yes \
-       file://pxa2xx_udc.patch;apply=yes \
-       file://bkpxa-pxa-cpu.patch;apply=yes \
-       file://bkpxa-pxa-cpufreq.patch;apply=yes \
-       file://proc-gpio.patch;apply=yes \
-       file://serial-ether-addr.patch;apply=yes \
-       file://cpufreq-better-freqs.patch;apply=yes \
-       file://ethernet-config.patch;apply=yes \
-       file://smc-ether-addr.patch;apply=yes \
-       file://cpufreq-ondemand-by-default.patch;apply=yes \
-       file://modular-init-bluetooth.patch;apply=yes \
-       file://modular-init-smc91x.patch;apply=yes \
-       file://modular-init-usb-gadget.patch;apply=yes \
-       file://bugfix-i2c-include.patch;apply=yes \
-       file://bugfix-mmc-clock.patch;apply=yes \
-       file://bugfix-pxa-cpufreq.patch;apply=yes \
-       file://bugfix-serial-interrupt.patch;apply=yes \
-       file://bugfix-serial-register-status.patch;apply=yes \
-       file://mach-types-fix.patch;apply=yes \
-       file://pcm-gcc-411-bugfix.patch;apply=yes \
-       file://ucb1400-ac97-audio.patch;apply=yes \
-       file://gumstix-asoc.patch;apply=yes \
-       file://disable-uncompress-message.patch;apply=yes \
-       file://serial-divisor.patch;apply=yes \
-       file://mmc-card-detect.patch;apply=yes \
-       file://misalignment-handling.patch;apply=yes \
-       file://compile-fix-pxa_cpufreq.patch;apply=yes \
-       file://pxafb-definition.patch;apply=yes \
-       file://270-usb-gadget-udc.patch;apply=yes \
-       file://gumstix-pxa270-usb-host.patch;apply=yes \
-       file://cpufreq-fixup.patch;apply=yes \
-       file://uImage-in-own-partition.patch;apply=yes \
-       file://pxa-regs-fixup.patch;apply=yes \
-       file://gumstix-fb-logo.patch;apply=yes \
-       file://gumstix-pxa270-mmc.patch;apply=yes \
-       ${RPSRC}/pxa27x_overlay-r5.patch;apply=yes;name=rppatch23 \
-       file://smc911x-fixup.patch;apply=yes \
+       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 8307e27..cd833e3 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
@@ -14,9 +14,9 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${BASE_KERNEL_VERSION
            file://defconfig \
            "
 
-SRC_URI_append_kb9202 = " http://maxim.org.za/AT91RM9200/2.6/2.6.23-rc3-at91.patch.gz;apply=yes;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;apply=yes;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 2918077..f308a00 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
@@ -15,18 +15,18 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${BASE_KERNEL_VERSION
            "
 
 SRC_URI_append_ts72xx = "\
-           file://ep93xx-gpio-interrupt-debounce.diff;apply=yes \
-           file://ep93xx-i2c-bus.diff;apply=yes \
-           file://ep93xx-i2c.diff;apply=yes \
-           file://ep93xx-leds.diff;apply=yes \
-           file://ep93xx-serial-uartbaud.diff;apply=yes \
-           file://ep93xx-serial-clocks.diff;apply=yes \
-           file://ep93xx-timer-accuracy.diff;apply=yes \
-           file://ep93xx-maverick-uniqid.patch;apply=yes \
-           file://ts72xx-nfbit-fix.patch;apply=yes \
-           file://ts72xx-machine-id-fix.patch;apply=yes \
-           file://ts72xx-watchdog.patch;apply=yes \
-           file://ts72xx-use-cpld-reset.patch;apply=yes \
+           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 7b68efc..4c0e448 100644
--- a/recipes/linux/linux_2.6.22.bb
+++ b/recipes/linux/linux_2.6.22.bb
@@ -14,22 +14,22 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2;name=k
 	   "
 
 SRC_URI_append_cm-x270 = "\
-	file://0001-cm-x270-base2.patch;apply=yes \
-	file://0002-cm-x270-match-type.patch;apply=yes \
-	file://0003-cm-x270-ide.patch;apply=yes \
-	file://0004-cm-x270-it8152.patch;apply=yes \
-	file://0005-cm-x270-pcmcia.patch;apply=yes \
-	file://0006-ramdisk_load.patch;apply=yes \
-	file://0007-mmcsd_large_cards-r0.patch;apply=yes \
-	file://0008-cm-x270-nand-simplify-name.patch;apply=yes"
+	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;apply=yes;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;apply=yes;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 01454da..87005cf 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
@@ -13,13 +13,13 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2;name=k
 S = "${WORKDIR}/linux-2.6.23"
 
 SRC_URI_append_cm-x270 = "\
-	file://0001-cm-x270-match-type.patch;apply=yes \
-	file://0002-ramdisk_load.patch;apply=yes \
-	file://0003-mmcsd_large_cards-r0.patch;apply=yes \
-	file://0004-cm-x270-nand-simplify-name.patch;apply=yes \
-	file://0005-cmx270-pci.patch;apply=yes"
+	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;apply=yes"
+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 a05139a..08d039e 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
@@ -13,7 +13,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2;name=k
 S = "${WORKDIR}/linux-2.6.23"
 
 SRC_URI_append_at91sam9260ek = "\
-	file://0001-2.6.23-at91.patch;apply=yes \
+	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 7070de4..d446b23 100644
--- a/recipes/linux/linux_2.6.23.bb
+++ b/recipes/linux/linux_2.6.23.bb
@@ -9,8 +9,8 @@ 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;apply=yes \
-           file://kallsyms-missing-include.patch;apply=yes \
+	   file://binutils-buildid-arm.patch \
+           file://kallsyms-missing-include.patch \
            file://defconfig \
 	   "
 
@@ -19,37 +19,37 @@ SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-2.6.23.17.bz2;apply=
 # Real-time preemption (includes CFS). This is experimental and requires a different defconfig.
 #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;apply=yes"
+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;apply=yes;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;apply=yes"
+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;apply=yes;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;apply=yes "
+	file://em-x270.patch "
 
 SRC_URI_append_cm-x270 = "\
-	file://0001-cm-x270-base2.patch;apply=yes \
-	file://0002-cm-x270-match-type.patch;apply=yes \
-	file://0003-cm-x270-ide.patch;apply=yes \
-	file://0004-cm-x270-it8152.patch;apply=yes \
-	file://0005-cm-x270-pcmcia.patch;apply=yes \
-	file://0006-ramdisk_load.patch;apply=yes \
-	file://0007-mmcsd_large_cards-r0.patch;apply=yes \
-	file://0008-cm-x270-nand-simplify-name.patch;apply=yes"
+	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;apply=yes \
-	file://mpc8313e-rdb-leds.patch;apply=yes \
-	file://mpc8313e-rdb-rtc.patch;apply=yes"
+	file://mpc831x-nand.patch \
+	file://mpc8313e-rdb-leds.patch \
+	file://mpc8313e-rdb-rtc.patch"
 
 SRC_URI_append_mpc8323e-rdb = "\
-	file://mpc832x-leds.patch;apply=yes" 
+	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 1c36705..e937603 100644
--- a/recipes/linux/linux_2.6.24.bb
+++ b/recipes/linux/linux_2.6.24.bb
@@ -15,54 +15,54 @@ 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;apply=yes;name=stablepatch \
-           file://squashfs-lzma-2.6.24.patch;apply=yes \
-           file://ubifs-v2.6.24.patch;apply=yes \
+           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;apply=yes \
-#           file://leds-cpu-activity.patch;apply=yes \
-#           file://leds-cpu-activity-powerpc.patch;apply=yes \
+#           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;apply=yes \
-           file://linux-2.6.24-SIMpad-battery-old-way-but-also-with-sysfs.patch;apply=yes \
-           file://linux-2.6.24-SIMpad-cs3-simpad.patch;apply=yes \
-           file://linux-2.6.24-SIMpad-mq200.patch;apply=yes \
-           file://linux-2.6.24-SIMpad-pcmcia.patch;apply=yes \
+           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;apply=yes \
-           file://linux-2.6.24-SIMpad-ucb1x00-ts-supend-and-accuracy.patch;apply=yes \
-           file://linux-2.6.24-SIMpad-hostap_cs-shared-irq.patch;apply=yes \
-           file://linux-2.6.24-SIMpad-orinoco_cs-shared-irq.patch;apply=yes \ 
-           file://linux-2.6.24-SIMpad-rtc-sa1100.patch;apply=yes \
-           file://linux-2.6.24-SIMpad-ucb1x00-audio.patch;apply=yes \
-	   file://connectplus-remove-ide-HACK.patch;apply=yes \
-	   file://collie-kexec.patch;apply=yes \
-           file://export_atags-r2.patch;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;apply=yes \
-	file://0002-gesbc-eth-platform.patch;apply=yes \
-	file://0005-ep93xx-reboot.patch;apply=yes \
+	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;apply=yes \
-	file://mpc8313e-rdb-leds.patch;apply=yes \
-	file://mpc8313e-rdb-rtc.patch;apply=yes \
-	file://mpc8313e-rdb-cardbus.patch;apply=yes \
+	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;apply=yes \
-	file://0002-ramdisk_load.patch;apply=yes \
-	file://0003-mmcsd_large_cards-r0.patch;apply=yes \
-	file://0004-cm-x270-nand-simplify-name.patch;apply=yes \
-	file://0005-add-display-set-default-16bpp.patch;apply=yes \
+	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;apply=yes \
-	file://ep93xx-i2c-bus.diff;apply=yes \
-	file://ep93xx-i2c.diff;apply=yes \
-	file://ep93xx-leds.diff;apply=yes \
-	file://ep93xx-serial-uartbaud.diff;apply=yes \
-	file://ep93xx-serial-clocks.diff;apply=yes \
-	file://ep93xx-timer-accuracy.diff;apply=yes \
-	file://ep93xx-maverick-uniqid.patch;apply=yes \
-	file://ep93xx-eth-phylib-framework.patch;apply=yes \
-	file://ts72xx-nfbit-fix.patch;apply=yes \
-	file://ts72xx-machine-id-fix.patch;apply=yes \
-	file://ts72xx-watchdog.patch;apply=yes \
-	file://ts72xx-use-cpld-reset.patch;apply=yes \
-	file://ts72xx-rs485.patch;apply=yes"
+	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;apply=yes \
-	file://hipox.patch;apply=yes \
-	file://hipox-uart.patch;apply=yes \
-	file://hipox-pci-config-delay.patch;apply=yes \
-	file://hipox-pci-max-size.patch;apply=yes \
-	file://hipox-nand.patch;apply=yes \
-	file://hipox-ubifs.patch;apply=yes \
-	file://hipox-kconfig.patch;apply=yes \
-	file://hipox-sata-module.patch;apply=yes \
-	file://hipox-OXE-INT2.patch;apply=yes \
-	file://hipox-rtc.patch;apply=yes \
-	file://hipox-nand-vs-pci.patch;apply=yes \
-	file://hipox-nand-vs-nor.patch;apply=yes \
-	file://ox810-gmac-without-leon.patch;apply=yes \
+	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;apply=yes;name=stablepatch \
-    file://smartq-gitupdate.diff;apply=yes \
-    file://base/0001-Apply-samsung-kernel-patch.patch;apply=yes \
-    file://base/0002-Apply-smartq-patch.patch;apply=yes \
-    file://mer/0001-Mer-keymappings-change.patch;apply=yes \
-    file://mer/0002-no-DM9000.patch;apply=yes \
-    file://mer/0003-Mer-WPA-fix.patch;apply=yes \
-    file://mer/0004-Mer-hardwire-USB-OTG-gadget-type.patch;apply=yes \
-    file://mer/0005-backlight-parameter-and-fixes.patch;apply=yes \
-    file://mer/0006-tv-encoder.patch;apply=yes \
-    file://mer/0007-make-tv-encoder-scaler-compile.patch;apply=yes \
-    file://mer/0008-build-TV-by-default.patch;apply=yes \
-    file://mer/0009-Apply-cpufreq-patch-from-gqwang.patch;apply=yes \
-    file://mer/0010-Better-compatibility-with-some-memory-chips.patch;apply=yes \
-    file://mer/0011-Only-reserve-memory-for-TV-if-CONFIG_VIDEO_SAMSUNG_T.patch;apply=yes \
-    file://mer/0012-Disable-TV-out-to-save-RAM.patch;apply=yes \
+    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 d99ab84..db5bd1e 100644
--- a/recipes/linux/linux_2.6.25.bb
+++ b/recipes/linux/linux_2.6.25.bb
@@ -21,42 +21,42 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2;name=k
            file://defconfig"
 
 SRC_URI_append_mpc8313e-rdb = "\
-	file://mpc831x-nand.patch;apply=yes \
-	file://mpc8313e-rdb-leds.patch;apply=yes \
-	file://mpc8313e-rdb-cardbus.patch;apply=yes \
+	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;apply=yes \
-	file://0002-ramdisk_load.patch;apply=yes \
-	file://0003-mmcsd_large_cards-r0.patch;apply=yes \
-	file://0004-cm-x270-nand-simplify-name.patch;apply=yes \
-	file://0005-add-display-set-default-16bpp.patch;apply=yes \
+	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;apply=yes;name=atmelpatch \
-	file://virtualmouse.patch;apply=yes \
-#    file://pll1.diff;apply=yes \
+	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;apply=yes;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;apply=yes;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;apply=yes;name=ronetixpatch \
-        http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/socketcan-driver-at91.patch;apply=yes;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;apply=yes;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;apply=yes;name=ronetixpatch \
-        http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/socketcan-driver-at91.patch;apply=yes;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;apply=yes file://update-mach-types.diff;patch=1"
+SRC_URI_append_m8050 = " file://m8050.diff file://update-mach-types.diff;patch=1"
 
 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 ca3d71c..cae682f 100644
--- a/recipes/linux/linux_2.6.26.bb
+++ b/recipes/linux/linux_2.6.26.bb
@@ -16,25 +16,25 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2;name=k
 
 SRC_URI_append_boc01 = "\
 	file://boc01.dts \
-	file://fsl-elbc-nand-backport.patch;apply=yes \
-	file://002-081105-headers.patch;apply=yes \
-	file://004-081105-usb.patch;apply=yes \
-	file://005-081217-isl12024.patch;apply=yes \
-	file://006-081216-at24c32.patch;apply=yes \
-	file://007-081216-lm73.patch;apply=yes \
-	file://008-081127-spi.patch;apply=yes \
-	file://010-081105-mii.patch;apply=yes \
-	file://011-081202-gpio.patch;apply=yes \
-	file://012-081222-cy3218-btns.patch;apply=yes \
-	file://013-081212-lcd.patch;apply=yes \
+	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;apply=yes \
-	file://fsl-elbc-nand-backport.patch;apply=yes \
-	file://mpc8313e-rdb-leds.patch;apply=yes \
-	file://mpc8313e-rdb-cardbus.patch;apply=yes \
-	file://mpc8313e-rdb-eth-fixed.patch;apply=yes \
+	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;apply=yes;name=topaspatch"
diff --git a/recipes/linux/linux_2.6.27.bb b/recipes/linux/linux_2.6.27.bb
index 447d7e8..7014958 100644
--- a/recipes/linux/linux_2.6.27.bb
+++ b/recipes/linux/linux_2.6.27.bb
@@ -15,65 +15,65 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=ke
 
 SRC_URI_append_boc01 = "\
 	file://boc01.dts \
-	file://001-090114-sqn11x0-usb-hack.patch;apply=yes \
-	file://004-081205-usb.patch;apply=yes \
-	file://005-090226-isl12024.patch;apply=yes \
-	file://007-081217-lm73.patch;apply=yes \
-	file://008-081208-spi.patch;apply=yes \
-	file://011-090115-gpio.patch;apply=yes \
-	file://012-090219-capsense.patch;apply=yes \
-	file://013-090306-lcd.patch;apply=yes \
+	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;apply=yes\
-                          file://progear-ac2.patch;apply=yes"
+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;apply=yes \
-           file://linux-2.6.27-SIMpad-battery-old-way-but-also-with-sysfs.patch;apply=yes \
-           file://linux-2.6.27-SIMpad-cs3-simpad.patch;apply=yes \
-           file://linux-2.6.27-SIMpad-mq200.patch;apply=yes \
-           file://linux-2.6.27-SIMpad-pcmcia.patch;apply=yes \
+           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;apply=yes \
-           file://linux-2.6.27-SIMpad-ucb1x00-ts-supend-and-accuracy.patch;apply=yes \
-           file://linux-2.6.24-SIMpad-hostap_cs-shared-irq.patch;apply=yes \
-           file://linux-2.6.24-SIMpad-orinoco_cs-shared-irq.patch;apply=yes \
-           file://linux-2.6.24-SIMpad-rtc-sa1100.patch;apply=yes \
-           file://connectplus-remove-ide-HACK.patch;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;apply=yes \
-           file://0002-GPIO-fix.patch;apply=yes \
-           file://0003-Debounce-IRQ.patch;apply=yes \
-           file://0004-OHCI-fix.patch;apply=yes \
-           file://0005-Fix-wrong-machine-ID-passed-from-RedBoot.patch;apply=yes \
-           file://0006-Force-the-nF-bit-on.patch;apply=yes \
-           file://0007-Use-CPLD-watchdog-to-reset.patch;apply=yes \
-           file://0008-Fix-UART-clocks.patch;apply=yes \
-           file://0009-CPU-info-and-board-revision.patch;apply=yes \
-           file://0010-GPIO-leds.patch;apply=yes \
-           file://0011-EP93xx-Ethernet-support.patch;apply=yes \
-           file://0012-TS72xx-watchdog.patch;apply=yes \
-           file://0013-TS7200-NOR-physmap-fix.patch;apply=yes \
-           file://0014-TS-7200-8MB-NOR-flash.patch;apply=yes \
-           file://0015-TS-72xx-MAX197-support.patch;apply=yes \
-           file://0016-RS485-common-bits.patch;apply=yes \
-           file://0017-TS-72xx-SBC-proc-info.patch;apply=yes \
-           file://0018-EP93xx-GPIO-I2C.patch;apply=yes \
-           file://0019-EP93xx-SPI-driver.patch;apply=yes \
-           file://0020-TS-72XX-LCD-console-driver.patch;apply=yes \
-           file://0021-EP93xx-GPIO-matrix-keypad.patch;apply=yes \
-           file://0022-TS-72xx-RS485-auto-mode-support.patch;apply=yes \
-           file://0023-Clean-and-invalidate-D-cache-entry.patch;apply=yes \
-           file://0024-PC-104-I-O-and-memory-mappings.patch;apply=yes \
-           file://0025-EP93xx-discontigmem.patch;apply=yes \
-           file://0026-TS72xx-PATA-support.patch;apply=yes \
-           file://0027-TS72xx-TS-SER1-support.patch;apply=yes \
-           file://0028-TS72xx-TS-ETH100.patch;apply=yes \
-           file://0029-EP93xx-Power-Management-Routines.patch;apply=yes \
-           file://0030-EP93xx-CPUfreq-driver.patch;apply=yes \
+           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 8888002..770ca1b 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;apply=yes \
+        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 2d72987..893e470 100644
--- a/recipes/linux/linux_2.6.28.bb
+++ b/recipes/linux/linux_2.6.28.bb
@@ -20,49 +20,49 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2;name=k
            file://defconfig"
 
 SRC_URI_append_at91sam9263ek = " \
-           file://linux-2.6.28-at91.patch.bz2;apply=yes \
-	   file://linux-2.6.28-exp.patch.bz2;apply=yes "
+           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;apply=yes \
-           file://linux-2.6.28-exp.patch.bz2;apply=yes \
-           http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.28/003_linux-2.6.28-at91-ronetix-20112009.patch;apply=yes;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;apply=yes \
-           file://linux-2.6.28-exp.patch.bz2;apply=yes \
-           file://linux-2.6.28.10-at91-mh.patch;apply=yes "
+           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;apply=yes \
-           file://ebase-fix.patch;apply=yes \
-           file://enable-uart.patch;apply=yes \
-           file://ip3902.patch;apply=yes"
+           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;apply=yes \
-	file://0002-add-locomo_spi-driver.patch;apply=yes \
-	file://0003-enable-cpufreq-for-collie.patch;apply=yes \
-	file://0004-fix-dma-for-SA1100.patch;apply=yes \
-	file://0005-fix-collie-keyboard-bug.patch;apply=yes \
-	file://0006-add-collie-flash-hack.patch;apply=yes \
-	file://0007-hostap-workaround-for-buggy-sa1100-pcmcia-driver.patch;apply=yes \
-	file://0008-fix-collie-suspend-hack.patch;apply=yes \
-	file://0009-add-sa1100-usb-gadget-driver-hack.patch;apply=yes \
-	file://0010-mmc_spi-add-suspend-and-resume-callbacks.patch;apply=yes \
-	file://0011-move-drivers-mfd-.h-to-include-linux-mfd.patch;apply=yes \
-	file://0012-move-ucb1200-ts-driver.patch;apply=yes \
-	file://0013-add-collie-touchscreen-driver.patch;apply=yes \
-	file://0014-collie-locomo-led-change-default-trigger.patch;apply=yes \
-	file://0015-SA1100-make-gpio_to_irq-and-reverse-a-macro.patch;apply=yes \
-	file://0016-add-gpiolib-support-to-ucb1x00.patch;apply=yes \
-	file://0017-collie-convert-to-gpiolib-for-ucb1x00.patch;apply=yes \
-	file://0018-collie-add-battery-driver.patch;apply=yes \
-	file://0019-collie-support-pda_power-driver.patch;apply=yes \
-	file://0020-remove-collie_pm.c.patch;apply=yes \
-	file://0021-mmc-trivial-annotation-of-blocks.patch;apply=yes \
-	file://0022-mmc_block-print-better-error-messages.patch;apply=yes \
-	file://0023-mmc_block-ensure-all-sectors-that-do-not-have-error.patch;apply=yes " 
+	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;apply=yes \
@@ -74,11 +74,11 @@ SRC_URI_append_gamecube = " \
 	"
 
 SRC_URI_append_tx27 = " \
-	file://linux-2.6.28-karo4.diff;apply=yes \
+	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;apply=yes;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 381c3f0..10e595e 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
@@ -25,14 +25,14 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${OLD_KERNEL_RELEASE}
            file://defconfig"
 
 SRC_URI_append_afeb9260 = " \
-        file://0001-SRAM-TX-buffers-implementation-from-atmel-to-fix-TX.patch;apply=yes \
-        file://0002-RS-485-mode-of-USART1.patch;apply=yes \
-        file://0004-AFEB9260-ASoC-driver.patch;apply=yes \
+        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;apply=yes \
-	file://linux-2.6.30-rc4-karo3.diff;apply=yes \
-        file://stk5-baseboard_c_vesa640.patch;apply=yes"
+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.bb b/recipes/linux/linux_2.6.29.bb
index 754af43..2b80884 100644
--- a/recipes/linux/linux_2.6.29.bb
+++ b/recipes/linux/linux_2.6.29.bb
@@ -25,50 +25,50 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2;name=k
 SRC_URI_append_boc01 = "\
 	file://boc01.dts \
 	file://boc01.dts.v1 \
-	file://004-081205-usb.patch;apply=yes \
-	file://005-091008-isl12024.patch;apply=yes \
-	file://007-091005-lm73.patch;apply=yes \
-	file://008-091005-spi.patch;apply=yes \
-	file://011-090115-gpio.patch;apply=yes \
-	file://012-091019-capsense.patch;apply=yes \
-	file://013-091015-lcd.patch;apply=yes \
+	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;apply=yes \
+        file://0001-powerpc-4xx-Add-PPC4xx-PCIe-MSI-support.patch \
         "
 
 SRC_URI_append_micro2440 = " \
-	file://0001-S3C-Backported-the-s3c2410-touchscreen-from-openmok.patch;apply=yes \
-	file://0002-S3C-Backported-openmoko-s-touchscreen-filters.patch;apply=yes \
-	file://0003-VENDOR-armworks-logo.patch;apply=yes \
-	file://0004-920T-Use-specific-920t-mtune.patch;apply=yes \
-	file://0006-S3C-Allow-the-machine-code-to-get-the-BBT-table-fro.patch;apply=yes \
-	file://0007-MINI2440-Add-machine-support.patch;apply=yes \
-	file://0008-MINI2440-Delays-command-check-response-on-SD.patch;apply=yes \
-	file://0009-MINI2440-Rename-the-SoC-tty-names.patch;apply=yes \
-	file://0010-MINI2440-creates-a-mini2440_defconfig-file.patch;apply=yes \
-	file://0011-MINI2440-Add-touchscreen-support.patch;apply=yes \
+	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;apply=yes \
-        file://0002-spi-pxa2xx-spi-set-default-cs_control-to-null_cs_co.patch;apply=yes \
+        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;apply=yes \
-	file://edb9301-fix-machine-id.patch;apply=yes \
+        file://add-edb9301.patch \
+	file://edb9301-fix-machine-id.patch \
 	"
 
 SRC_URI_append_cm-x270 = "\
-	file://0001-xm_x2xx-config-fix-up-CMDLINE.patch;apply=yes \
-	file://0002-cm-x270-nand-change-name-of-device.patch;apply=yes \
-	file://0003-cm-x2xx.c-add-support-for-sharp-VGA-display-panel.patch;apply=yes \
+	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;apply=yes \
+    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 e6734ba..2c34314 100644
--- a/recipes/linux/linux_2.6.30.bb
+++ b/recipes/linux/linux_2.6.30.bb
@@ -17,13 +17,13 @@ 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;apply=yes;name=stablepatch \
-           http://maxim.org.za/AT91RM9200/2.6/2.6.30-at91.patch.gz;apply=yes;name=at91patch \
-           file://aufs2-30.patch;apply=yes \
+           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;apply=yes"
+SRC_URI_append_mpc8315e-rdb = " file://mpc8315erdb-add-msi-to-dts.patch"
 
-SRC_URI_append_at91sam9263ek = " file://hrw-linux-2.6.30-exp.patch;apply=yes "
+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 122f400..5c1562c 100644
--- a/recipes/linux/linux_2.6.31.bb
+++ b/recipes/linux/linux_2.6.31.bb
@@ -18,57 +18,57 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=ke
            ${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;apply=yes \
-            file://0002-Squashfs-Factor-out-remaining-zlib-dependencies-int.patch;apply=yes \
-            file://0003-Squashfs-add-a-decompressor-framework.patch;apply=yes \
-            file://0004-Squashfs-add-decompressor-entries-for-lzma-and-lzo.patch;apply=yes \
-            file://0005-Squashfs-add-an-extra-parameter-to-the-decompressor.patch;apply=yes \
-            file://0006-Squashfs-add-LZMA-compression.patch;apply=yes \
-            file://0007-Squashfs-Make-unlzma-available-to-non-initramfs-ini.patch;apply=yes \
+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;apply=yes;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;apply=yes;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;apply=yes \
-           file://005-091110-isl12024.patch;apply=yes \
-           file://007-091005-lm73.patch;apply=yes \
-           file://011-091028-gpio.patch;apply=yes \
-           file://012-091019-capsense.patch;apply=yes \
-           file://013-091015-lcd.patch;apply=yes \
-           file://014-091030-buttons.patch;apply=yes \
+           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;apply=yes \
-           file://0002-collie-fix-scoop-convesion-to-new-api.patch;apply=yes \
-           file://0003-collie-prepare-for-gpiolib-use.patch;apply=yes \
-           file://0004-move-drivers-mfd-.h-to-include-linux-mfd.patch;apply=yes \
-           file://0005-collie-locomo-led-change-default-trigger.patch;apply=yes \
-           file://0006-SA1100-make-gpio_to_irq-and-reverse-a-macro.patch;apply=yes \
-           file://0007-add-gpiolib-support-to-ucb1x00.patch;apply=yes \
-           file://0008-collie-convert-to-gpiolib-for-ucb1x00.patch;apply=yes \
-           file://0009-collie-add-battery-driver.patch;apply=yes \
-           file://0010-collie-support-pda_power-driver.patch;apply=yes \
-           file://0011-fix-collie-keyboard-bug.patch;apply=yes \
-           file://0012-add-collie-touchscreen-driver.patch;apply=yes \
-           file://0013-add-sa1100-udc-hack-extra-hacked-for-collie.patch;apply=yes \
-           file://0014-gadget-add-file.patch;apply=yes \
-           file://0004-fix-dma-for-SA1100.patch;apply=yes \
+           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;apply=yes \
+           file://edb9301-fix-machine-id.patch \
            "
 
 SRC_URI_append_cm-x300 = "\
-           file://linux-2.6.31-cm-x300.patch;apply=yes \
+           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 9c8b80e..564e311 100644
--- a/recipes/linux/linux_2.6.32.bb
+++ b/recipes/linux/linux_2.6.32.bb
@@ -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;apply=yes \
-	file://at91/linux-2.6.32-002-sam9g20-proper-reset.patch;apply=yes \
+	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;apply=yes \
-			file://ep93xx/simone-board-def.patch;apply=yes \
-			file://ep93xx/ep93xx-regs.patch;apply=yes \
-			file://ep93xx/ep93xx-i2c.patch;apply=yes \
-			file://ep93xx/ep93xx-touchscreen.patch;apply=yes \
-			file://ep93xx/ep93xx-spi.patch;apply=yes \
-			file://ep93xx/ep93xx-cpuinfo.patch;apply=yes "
+			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;apply=yes \
-                        file://0002-ts72xx_force_machine-id.patch;apply=yes \
-                        file://0003-ep93xx_cpuinfo.patch;apply=yes \
-                        file://0004-ts72xx_sbcinfo.patch;apply=yes \
-                        file://0005-ep93xx_eth.patch;apply=yes \
-                        file://0006-ts72xx_ts_ser1.patch;apply=yes \
-                        file://0007-ts72xx_rs485.patch;apply=yes \
-                        file://0008-ts72xx_ts_eth100.patch;apply=yes \
-                        file://0009-ts7200_cf_ide.patch;apply=yes \
-                        file://0010-ts72xx_pata.patch;apply=yes \
-                        file://0011-ep93xx_pm.patch;apply=yes \
-                        file://0012-ts72xx_gpio_i2c.patch;apply=yes \
-                        file://0013-ts72xx_dio_keypad.patch;apply=yes \
-                        file://0014-ep93xx_spi.patch;apply=yes \
-                        file://0015-ep93xx_cpufreq.patch;apply=yes \
-                        file://0016-ts7200_nor_flash.patch;apply=yes \
+                        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;apply=yes;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;apply=yes "
+	file://intelfb.patch "
diff --git a/recipes/linux/linux_2.6.33.bb b/recipes/linux/linux_2.6.33.bb
index f78ee29..a27c79a 100644
--- a/recipes/linux/linux_2.6.33.bb
+++ b/recipes/linux/linux_2.6.33.bb
@@ -22,31 +22,31 @@ SRC_URI[kernel.md5sum] = "c3883760b18d50e8d78819c54d579b00"
 SRC_URI[kernel.sha256sum] = "63e237de3b3c4c46a21833b9ce7e20574548d52dabbd1a8bf376041e4455d5c6"
 
 SRC_URI_append_ts72xx = " \
-                        file://0001-ts72xx_base.patch;apply=yes \
-                        file://0002-ts72xx_force_machine-id.patch;apply=yes \
-                        file://0003-ep93xx_cpuinfo.patch;apply=yes \
-                        file://0004-ts72xx_sbcinfo.patch;apply=yes \
-                        file://0005-ep93xx_eth.patch;apply=yes \
-                        file://0006-ts72xx_ts_ser1.patch;apply=yes \
-                        file://0007-ts72xx_rs485.patch;apply=yes \
-                        file://0008-ts72xx_ts_eth100.patch;apply=yes \
-                        file://0009-ts7200_cf_ide.patch;apply=yes \
-                        file://0010-ts72xx_pata.patch;apply=yes \
-                        file://0011-ep93xx_pm.patch;apply=yes \
-                        file://0012-ts72xx_gpio_i2c.patch;apply=yes \
-                        file://0013-ts72xx_dio_keypad.patch;apply=yes \
-                        file://0014-ep93xx_spi.patch;apply=yes \
-                        file://0015-ep93xx_cpufreq.patch;apply=yes \
-                        file://0016-ts7200_nor_flash.patch;apply=yes \
+                        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;apply=yes \
-                        file://0002-SRAM-for-ethernet-TX-patch.patch;apply=yes \
-                        file://0003-SRAM-TX-buffers-implementation-from-atmel-to-fix-TX-.patch;apply=yes \
-                        file://0004-Disallowing-non-power-of-2-ring-size-proper-resource.patch;apply=yes \
-                        file://0005-Add-missing-header-file.patch;apply=yes \
-                        file://0006-Enable-SPI1.patch;apply=yes \
-                        file://0007-Adding-4th-serial-port.patch;apply=yes \
+                        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
index fcd8e6d..b406e53 100644
--- a/recipes/linux/linux_2.6.34.bb
+++ b/recipes/linux/linux_2.6.34.bb
@@ -4,7 +4,7 @@ require linux.inc
 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;apply=yes;status=pending \
+           file://ARM-Add-support-for-LZMA-compressed-kernel-images.patch;status=pending \
            file://defconfig"
 
 SRC_URI[kernel.md5sum] = "10eebcb0178fb4540e2165bfd7efc7ad"
diff --git a/recipes/linux/linux_git.bb b/recipes/linux/linux_git.bb
index de96329..c8fedc8 100644
--- a/recipes/linux/linux_git.bb
+++ b/recipes/linux/linux_git.bb
@@ -5,7 +5,7 @@ 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;apply=yes;status=pending \
+           file://ARM-Add-support-for-LZMA-compressed-kernel-images.patch;status=pending \
            file://defconfig"
 
 S = "${WORKDIR}/git"
diff --git a/recipes/linux/logicpd-pxa270_2.6.17-rc5.bb b/recipes/linux/logicpd-pxa270_2.6.17-rc5.bb
index 77ef357..19fea42 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;apply=yes;striplevel=0 \
-           file://ucb1400-ac97-audio.patch;apply=yes \
-           file://ucb1400-touchscreen.patch;apply=yes \
+           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 dc92bb2..f5282b8 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;apply=yes \
-	   file://pxafb_fix_params-r2.patch;apply=yes \
-           file://pxa_irda_susres_fix-r0.patch;apply=yes \
-           file://pxa_keys-r5.patch;apply=yes \
-           file://pxa_timerfix-r0.patch;apply=yes \
-           file://input_power-r6.patch;apply=yes \
-           file://pxa25x_cpufreq-r1.patch;apply=yes \
-           file://pm_changes-r1.patch;apply=yes \
-           file://usb_add_epalloc-r3.patch;apply=yes \
-           file://usb_pxa27x_udc-r3.patch;apply=yes \
-           file://kexec-arm-r3.patch;apply=yes \
-           file://pxa27x_overlay-r4.patch;apply=yes \
-           file://xscale_cache_workaround-r1.patch;apply=yes \
-           file://ucb1400-touchscreen.patch;apply=yes \
-           file://config-nr-tty-devices.patch;apply=yes \
+	   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;apply=yes;striplevel=0 \
-           file://logicpd-pxa270-flash.patch;apply=yes;striplevel=0 \
-           file://logicpd-pxa270-hardware-id-hack.patch;apply=yes;striplevel=0 \
-           file://logicpd-pxa270-smc91x.patch;apply=yes;striplevel=0 \
-           file://logicpd-pxa270-lcd-osd024ttea2.patch;apply=yes;striplevel=0 \
+           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 8c494f9..1e3df35 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;apply=yes;striplevel=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 f60d8b5..3145e9d 100644
--- a/recipes/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
+++ b/recipes/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
@@ -11,7 +11,7 @@ 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;apply=yes;name=rmkpatch \
 	   file://diff-${KV}-rmk${RMKV}-pxa${PXAV}.gz;apply=yes \
-	   file://mnci-combined.patch;apply=yes"
+	   file://mnci-combined.patch"
 
 S = "${WORKDIR}/linux-${KV}"
 
diff --git a/recipes/linux/mx21ads-kernel_2.6.19rc6.bb b/recipes/linux/mx21ads-kernel_2.6.19rc6.bb
index de70fff..6891d7f 100644
--- a/recipes/linux/mx21ads-kernel_2.6.19rc6.bb
+++ b/recipes/linux/mx21ads-kernel_2.6.19rc6.bb
@@ -7,7 +7,7 @@ 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;apply=yes;name=rcpatch \
-    http://opensource.wolfsonmicro.com/~lg/linux-2.6-mx21/mx21ads-2.6.19rc6-lg1.patch.bz2;apply=yes;name=mx21patch \
+    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 8fac60b..151a649 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;apply=yes;name=patch1 \
-	http://linuxtogo.org/~koen/netbook-pcon-r0.patch;apply=yes;name=patch2 \
-	http://linuxtogo.org/~koen/netbook-pcon-i2c-r1.patch;apply=yes;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/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb b/recipes/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
index 3f34764..3406a63 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;apply=yes \
-           file://${KV}-${VRSV}-${PXAV}.patch;apply=yes \
-           file://${KV}-${VRSV}-${PXAV}-${JPMV}.patch;apply=yes \
-           file://sound-volume-reversed.patch;apply=yes \
-	   file://disable-pcmcia-probe.patch;apply=yes \
-           file://mkdep.patch;apply=yes \
+           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;apply=yes;name=patch \
-           file://mipv6-1.1-v2.4.25.patch;apply=yes \
-           file://simpad-backlight-if.patch;apply=yes \
-           file://simpad-switches-input.patch;apply=yes \
-           file://simpad-switches-input2.patch;apply=yes \
-           file://simpad-apm.diff;apply=yes;striplevel=0 \
-           file://simpad-ts-noninput.patch;apply=yes \
-           file://simpad-pm-updates.patch;apply=yes;striplevel=0 \
-           file://support-128mb-ram.patch;apply=yes \
-           file://mmc-spi.patch;apply=yes \
-           file://iw249_we17-13.diff;apply=yes \
-           file://iw240_we18-5.diff;apply=yes \
+	   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;apply=yes
-# SRC_URI_append = file://machtune-args.patch;apply=yes
+# 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 b661c4e..ac8d3e2 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;apply=yes \
-           file://${KV}-${VRSV}-${PXAV}.patch;apply=yes \
-           file://${KV}-${VRSV}-${PXAV}-${JPMV}.patch;apply=yes \
-           file://${KV}-mh1.patch;apply=yes \
-           file://sound-volume-reversed.patch;apply=yes \
-	   file://disable-pcmcia-probe.patch;apply=yes \
-           file://mkdep.patch;apply=yes \
+           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;apply=yes;name=patch \
-           file://mipv6-1.1-v${KV}.patch;apply=yes \
-           file://simpad-backlight-if.patch;apply=yes \
-           file://simpad-switches-input.patch;apply=yes \
-           file://simpad-switches-input2.patch;apply=yes \
-           file://simpad-apm.patch;apply=yes \
-           file://simpad-ts-noninput.patch;apply=yes \
-           file://simpad-pm-updates.patch;apply=yes \
-           file://support-128mb-ram.patch;apply=yes \
-           file://simpad-proc-sys-board.patch;apply=yes \
-           file://simpad-serial.patch;apply=yes \
-           file://mppe-20040216.patch;apply=yes \
-           file://sa1100-usb-tcl1.patch;apply=yes \
-           file://mmc-spi.patch;apply=yes \
-           file://iw249_we17-13.diff;apply=yes \
-           file://iw240_we18-5.diff;apply=yes \
+	   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;apply=yes \
+#           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;apply=yes
-# SRC_URI_append = file://machtune-args.patch;apply=yes
+# 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 2e7d064..a8e1cca 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;apply=yes;striplevel=2 \
-           file://P02-C3000-voltage_050221.patch;apply=yes;striplevel=2 \
-           file://P03-C3000-SIGSTOP_FIX_041207.patch;apply=yes;striplevel=2 \
-           file://P04-C3000-UNICON_041206.patch;apply=yes;striplevel=2 \
-           file://P05-C3000-TSPRESSURE_041207.patch;apply=yes;striplevel=2 \
-           file://P06-C3000-WRITETS_041206.patch;apply=yes;striplevel=2 \
-           file://P07-C3000-KBDDEV_041206.patch;apply=yes;striplevel=2 \
-           file://P08-rtc-mremap-mremap2nd-fix_041213.patch;apply=yes;striplevel=2 \
-           file://P09-ext3-isofs-fix_041216.patch;apply=yes;striplevel=2 \
-           file://P10-ntfs-fix_041216.patch;apply=yes;striplevel=2 \
-           file://P11-bluetooth-mh18_041216.patch;apply=yes;striplevel=2 \
-           file://P12-fbcon-fix_041219.patch;apply=yes;striplevel=2 \
-           file://P14-lowlatency_041221.patch;apply=yes;striplevel=2 \
-           file://P17-bvdd_050222.patch;apply=yes;striplevel=2 \
-           file://P18-detailed_battery_050309.patch;apply=yes;striplevel=2 \
-           file://P02++050226.patch;apply=yes \
+           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;apply=yes \
-           file://iw240_we15-6.diff;apply=yes \
-           file://iw241_we16-6.diff;apply=yes \
-           file://iw249_we17-13.diff;apply=yes \
-           file://iw240_we18-5.diff;apply=yes \
-           file://bluecard_cs.patch;apply=yes \
-           file://compile.patch;apply=yes \
-           file://idecs.patch;apply=yes \
-           file://logo.patch;apply=yes \
-           file://initsh.patch;apply=yes \
-           file://disable-pcmcia-probe.patch;apply=yes \
-           file://deviceinfo.patch;apply=yes \
-           file://corgi-fbcon-logo.patch;apply=yes \
-           file://corgi-default-brightness.patch;apply=yes \
-           file://1764-1.patch;apply=yes \
-           file://armdeffix.patch;apply=yes \
-           file://add-oz-release-string.patch;apply=yes \
-           file://saner-spitz-keymap.patch;apply=yes \
+           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;apply=yes"
+# 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 0aa3b3f..486cd86 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
@@ -14,51 +14,51 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2;name=ke
            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;apply=yes \
-           file://swap-performance.patch;apply=yes \
-           file://bluetooth-2.4.18-mh15.patch;apply=yes \
-           file://iw_handlers.w13-5.diff;apply=yes \
-           file://iw_handlers.w14-5.diff;apply=yes \
-           file://iw240_we15-6.diff;apply=yes \
-           file://iw249_we16-6.diff;apply=yes \
-           file://iw249_we17-13.diff;apply=yes \
-           file://iw240_we18-5.diff;apply=yes \
-           file://bt950_cs.patch;apply=yes \
-           file://bluecard_cs.patch;apply=yes \
-           file://sharpsl_battery.patch;apply=yes \
-           file://buffered-fbmem.patch;apply=yes \
-           file://enable-sysrq.patch;apply=yes \
-           file://compile.patch;apply=yes \
-           file://idecs.patch;apply=yes \
-           file://logo.patch;apply=yes \
-           file://initsh.patch;apply=yes \
-           file://keyboard-ctrl+alt.patch;apply=yes \
-           file://keymap-more-sane.patch;apply=yes \
-           file://mkdep.patch;apply=yes \
-           file://disable-pcmcia-probe.patch;apply=yes \
-           file://deviceinfo.patch;apply=yes \
-           file://linux-2.4.18-list_move.patch;apply=yes \
-           file://tosa_map.patch;apply=yes \
-           file://tosa_ts.patch;apply=yes \
-           file://corgi-fbcon-logo.patch;apply=yes \
-           file://corgi-default-brightness.patch;apply=yes \
-           http://www.openswan.org/download/old/openswan-2.2.0-kernel-2.4-klips.patch.gz;apply=yes;name=patch4 \
-           file://1764-1.patch;apply=yes \
-           file://module_licence.patch;apply=yes \
-           file://ir240_sys_max_tx-2.diff;apply=yes \
-           file://ir241_qos_param-2.diff;apply=yes \
+           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;apply=yes \
-           file://dumb-hack-for-wlan-ng.patch;apply=yes \
-           file://unb0rk-apm.patch;apply=yes \
-           file://apm_arrowkey.patch;apply=yes \
+           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;apply=yes"
-SRC_URI_append_poodle255 += " file://smallfonts.diff;apply=yes"
+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;apply=yes
-SRC_URI_append_tosa = " file://tosa-power-key-off.patch;apply=yes"
+# 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 859eee9..249fc6f 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;apply=yes \
-           file://unb0rk-rightarrow.patch;apply=yes \
-           file://unb0rk-apm.patch;apply=yes \
-           file://battery.patch;apply=yes \
-           file://bluetooth-2.4.18-mh15.patch;apply=yes \
-           file://iw_handlers.w13-5.diff;apply=yes \
-           file://iw_handlers.w14-5.diff;apply=yes \
-           file://iw240_we15-6.diff;apply=yes \
-           file://iw249_we16-6.diff;apply=yes \
-           file://iw249_we17-13.diff;apply=yes \
-           file://iw240_we18-5.diff;apply=yes \
-           file://idecs.patch;apply=yes \
-           file://logo.patch;apply=yes \
-           file://initsh.patch;apply=yes \
-           file://keymap-more-sane.patch;apply=yes \
-           file://mkdep.patch;apply=yes \
-           file://disable-pcmcia-probe.patch;apply=yes \
-           file://linux-2.4.18-list_move.patch;apply=yes \
-           http://www.openswan.org/download/old/openswan-2.2.0-kernel-2.4-klips.patch.gz;apply=yes;name=patch \
-           file://1764-1.patch;apply=yes \
-           file://module_licence.patch;apply=yes \
-           file://ir240_sys_max_tx-2.diff;apply=yes \
-           file://ir241_qos_param-2.diff;apply=yes \
+           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;apply=yes
+#           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;apply=yes
-# SRC_URI_append = file://machtune-args.patch;apply=yes
+# SRC_URI_append = file://gcc-3.3.patch
+# SRC_URI_append = file://machtune-args.patch
 
 S = "${WORKDIR}/linux"
 
diff --git a/recipes/lisa/lisa_0.2.2.bb b/recipes/lisa/lisa_0.2.2.bb
index cb2720f..165b03c 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;apply=yes \
-	   file://head-n.patch;apply=yes"
+	   file://configure.patch \
+	   file://head-n.patch"
 LICENSE = "GPL"
 inherit autotools
 
diff --git a/recipes/llvm/llvm2.5-native_2.5.bb b/recipes/llvm/llvm2.5-native_2.5.bb
index bb41e88..416e068 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;apply=yes"
+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 d76fd8d..301aa47 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;apply=yes"
+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 102789a..dec132a 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;apply=yes \
-  file://llvm-debugonly-zeroormore.patch;apply=yes;striplevel=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 408428a..35aa38f 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;apply=yes \
-  file://llvm-debugonly-zeroormore.patch;apply=yes;striplevel=0 \
-  file://BX_to_BLX.patch;apply=yes \
+  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_2.7.bb b/recipes/llvm/llvm2.7_2.7.bb
index e27b8ae..b72581c 100644
--- a/recipes/llvm/llvm2.7_2.7.bb
+++ b/recipes/llvm/llvm2.7_2.7.bb
@@ -6,7 +6,7 @@ DEPENDS = "llvm-common llvm2.7-native"
 
 SRC_URI = "\
   http://llvm.org/releases/${PV}/llvm-${PV}.tgz \
-  file://BX_to_BLX.patch;apply=yes \
+  file://BX_to_BLX.patch \
   "
 
 EXTRA_OECMAKE += "\
diff --git a/recipes/lm_sensors/lmsensors-apps_2.10.1.bb b/recipes/lm_sensors/lmsensors-apps_2.10.1.bb
index 435c032..a397653 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;apply=yes \
-           file://add-sysfs-ldflags.patch;apply=yes"
+           file://prefix-fix.patch \
+           file://add-sysfs-ldflags.patch"
 
-SRC_URI_append_uclibc = "file://iconv.patch;apply=yes"
+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 534a17f..dcc33ac 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;apply=yes \
-           file://add-sysfs-ldflags.patch;apply=yes"
+           file://prefix-fix.patch \
+           file://add-sysfs-ldflags.patch"
 
-SRC_URI_append_uclibc = "file://iconv.patch;apply=yes"
+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 723eb12..bb852ab 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;apply=yes \
-	   file://exe.patch;apply=yes \
+	   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 d18d33a..3692daf 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;apply=yes \
+	   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 ab4d7d6..c014d51 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;apply=yes"
+          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 dd356ad..4c4011c 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;apply=yes \
-    file://client-makefile.patch;apply=yes \
-    file://scrolling-capture-dialog.patch;apply=yes \
+    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 1b508d5..cc57b90 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;apply=yes \
+	   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 7757d91..b0627b4 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;apply=yes" 
+           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 008514e..4a4e358 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;apply=yes \
-	   file://makefile.patch;apply=yes \
-	   file://gettext.patch;apply=yes"
+	   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 de5248b..5a4e78b 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;apply=yes \
-           file://runltp-path.patch;apply=yes \
+           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 c04a772..b09c501 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;apply=yes \
-           file://runltp-path.patch;apply=yes \
+           file://cross-compile.patch \
+           file://runltp-path.patch \
            file://ltp-run \
-           file://posix_shell_compat.patch;apply=yes \
-           file://ballista.patch;apply=yes"
+           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 4b18a26..5494c04 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;apply=yes \
-           file://runltp-path.patch;apply=yes \
-           file://fix-tcore_patch_test_suites.patch;apply=yes \
-           file://no-IDcheck.patch;apply=yes \
-           file://no_hyperthreading_tests.patch;apply=yes \
-           file://syscalls.patch;apply=yes"
+           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;apply=yes"
-SRC_URI_append_mipsel += "file://no_epoll_create2.patch;apply=yes"
-SRC_URI_append_arm += "file://no_epoll_create2.patch;apply=yes"
-SRC_URI_append_armeb += "file://no_epoll_create2.patch;apply=yes"
+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 127bd73..eab47eb 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;apply=yes;name=patch \
-  file://add-sysdep.patch;apply=yes \
-  file://ltrace-compile.patch;apply=yes \
-  file://ltrace-mips-remove-CP.patch;apply=yes \
-  file://ltrace-mips.patch;apply=yes \
-  file://ltrace-ppc.patch;apply=yes \
+  ${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 744841d..268398c 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;apply=yes"
+	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 cac22ce..06efdc0 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;apply=yes \
-	   file://make.patch;apply=yes \
-	   file://advanced-readline.patch;apply=yes"
-#	   http://lua-users.org/files/wiki_insecure/power_patches/5.0/advanced-readline.patch;apply=yes"
+	   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 1f50af3..d66e355 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;apply=yes"
+           file://crosscompile_fix.patch"
 
 # Unset user/group to unbreak install.
 EXTRA_OECONF = "--with-user= --with-group= --disable-o_direct"
diff --git a/recipes/lxt/lxt_1.0.bb b/recipes/lxt/lxt_1.0.bb
index ef63407..c7a4cf5 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;apply=yes"
+	   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 9be6495..9c4ac08 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;apply=yes \
+  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 ff38e8a..885293f 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;apply=yes \
-  file://qt4tools-detect.diff;apply=yes \
+  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 71b856b..1c8eba3 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;apply=yes \
-           file://002-lzmp.patch;apply=yes \
-           file://003-compile_fixes.patch;apply=yes \
-           file://100-static_library.patch;apply=yes"
+           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/madbufferfly/madbutterfly_git.bb b/recipes/madbufferfly/madbutterfly_git.bb
index fc73222..f8671fa 100644
--- a/recipes/madbufferfly/madbutterfly_git.bb
+++ b/recipes/madbufferfly/madbutterfly_git.bb
@@ -7,7 +7,7 @@ SRCREV = "ecd1842714b5e982f3138cbdd358517d57be6aa3"
 PV = "0.0.1+gitr${SRCREV}"
 
 SRC_URI = "git://git.gitorious.org/madbutterfly/mainline.git;protocol=git \
-           file://001_makefile.am_bugs.patch;apply=yes"
+           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 a7ac647..261ecf1 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;apply=yes"
+           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 c224e36..5391498 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;apply=yes \
-	   file://madwifi-skbpanic.patch;apply=yes"
+	   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 dee746f..baab484 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;apply=yes"
-WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf.patch;apply=yes"
+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;apply=yes \
-           file://10-xscale-le-elf-copts.patch;apply=yes \
-           file://10-sh4-le-elf-copts.patch;apply=yes \
-	   file://powerpc-fix.patch;apply=yes \
+           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_r3314-20080131.bb b/recipes/madwifi/madwifi-ng_r3314-20080131.bb
index 912d070..75c9851 100644
--- a/recipes/madwifi/madwifi-ng_r3314-20080131.bb
+++ b/recipes/madwifi/madwifi-ng_r3314-20080131.bb
@@ -7,7 +7,7 @@ PACKAGE_STRIP = "no"
 require madwifi-ng_r.inc
 
 SRC_URI += " \
-	file://30-define-ioreadwrite32be-for-little-endian-too.patch;apply=yes \
+	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 8bbbcc9..9d49f12 100644
--- a/recipes/madwifi/madwifi-ng_r3837-20080802.bb
+++ b/recipes/madwifi/madwifi-ng_r3837-20080802.bb
@@ -9,11 +9,11 @@ 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;apply=yes"
-WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf-v2.patch;apply=yes"
+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;apply=yes"
-SRC_URI += "file://madwifi-fix-2.6.30.patch;apply=yes"
+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_r4029-20090525.bb b/recipes/madwifi/madwifi-ng_r4029-20090525.bb
index 2061b64..ef21695 100644
--- a/recipes/madwifi/madwifi-ng_r4029-20090525.bb
+++ b/recipes/madwifi/madwifi-ng_r4029-20090525.bb
@@ -9,11 +9,11 @@ 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;apply=yes"
-WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf-v2.patch;apply=yes"
+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;apply=yes"
+		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 275eb37..0385263 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;apply=yes;striplevel=0;name=mapperPatch \
-	   file://fix_segfault.patch;apply=yes"
+           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 0fb591c..94fccab 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;apply=yes;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 c0efd9a..3c56364 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;apply=yes;striplevel=0 \
-           file://noWerror.patch;apply=yes;striplevel=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 dac3a65..5d6238c 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;apply=yes;striplevel=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 8f6544b..b80d45a 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;apply=yes;striplevel=0 \
-                 file://help-header-pp.patch;apply=yes;striplevel=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 c6bfc77..dbf80ab 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;apply=yes;striplevel=0 \
-           file://launch-no-o.patch;apply=yes;striplevel=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 24dc6a5..550c8a5 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;apply=yes"
+           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 9958485..65854fa 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;apply=yes"
+           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 7c3f152..c608ee0 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;apply=yes"
+			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 ee7e2de..11f3594 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;apply=yes;striplevel=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 e36f76f..f28881c 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;apply=yes;striplevel=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 9c3082d..45499a9 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;apply=yes"
+           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 59aa205..c6c6ea6 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;apply=yes"
+           file://configure-fix-version.patch"
 
 inherit autotools
 
diff --git a/recipes/maemo4/libgpsmgr_0.1.bb b/recipes/maemo4/libgpsmgr_0.1.bb
index 703d937..ccfef31 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;apply=yes"
+           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 8c9c9af..2991691 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;apply=yes \
+  file://libhildon-buildfix.patch \
   "
 
 
diff --git a/recipes/maemo4/libhildonfm_1.9.46.bb b/recipes/maemo4/libhildonfm_1.9.46.bb
index 4c22ce7..d149555 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;apply=yes \
+  file://libhildonfm-gtkmaemo-ifdef.patch \
 	"
 
 
diff --git a/recipes/maemo4/libosso_2.13.bb b/recipes/maemo4/libosso_2.13.bb
index b99a83b..e785818 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;apply=yes \
-  file://libosso-dont-use-inline.patch;apply=yes \
+  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 9935c9d..5bc7e94 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;apply=yes "
+           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 0af80ca..e44dc8a 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;apply=yes"
+	   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 2dbe607..918f938 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;apply=yes;name=patch \
-	   file://install.patch;apply=yes"
+	   ${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 a26d56b..a1416d1 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;apply=yes;name=patch \
-	   file://install.patch;apply=yes"
+	   ${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 06bce59..aad6a7a 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;apply=yes;name=patch \
-	   file://install.patch;apply=yes"
+	   ${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 0444d4c..c6e9f94 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;apply=yes"
+           file://SCCS.patch"
 
 inherit autotools
 
diff --git a/recipes/mamona/bash-noemu_3.2.bb b/recipes/mamona/bash-noemu_3.2.bb
index 88bafb0..4b517ec 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;apply=yes \
-           file://006-add_internal_libcpwd_functions.patch;apply=yes"
+           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 24966b3..2ba6b44 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;apply=yes \
-     file://binutils-uclibc-100-uclibc-conf.patch;apply=yes \
-     file://binutils-configure-texinfo-version.patch;apply=yes \
-     file://110-arm-eabi-conf.patch;apply=yes \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;apply=yes \
-     file://binutils-uclibc-300-006_better_file_error.patch;apply=yes \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;apply=yes \
+     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 e84d0ea..71ee384 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;apply=yes \
-     file://binutils-configure-texinfo-version.patch;apply=yes \
-     file://binutils-uclibc-100-uclibc-conf.patch;apply=yes \
-     file://110-arm-eabi-conf.patch;apply=yes \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch;apply=yes \
-     file://binutils-uclibc-300-006_better_file_error.patch;apply=yes \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;apply=yes \
+     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;apply=yes"
+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 22609a6..ff8d53e 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;apply=yes \
- file://fix_mem_allign.patch;apply=yes \
- file://cx3110x.patch;apply=yes \
- file://fix_cross_makefile.patch;apply=yes \
- file://fix_ssid_data_length.patch;apply=yes \
- file://770_performance_improvements.patch;apply=yes \
- file://create_sysfs_link_for_wlan0.patch;apply=yes \
- file://fix_opps_while_connecting_with_nm.patch;apply=yes \
+ 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 2a4018e..3365b04 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;apply=yes \
- file://create_sysfs_link_for_wlan0.patch;apply=yes \
- file://fix_old_include.patch;apply=yes \
+ 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 eb3d78f..84a481b 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;apply=yes \
- file://create_sysfs_link_for_wlan0.patch;apply=yes \
- file://fix_old_include.patch;apply=yes \
+ 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 9410f28..bd00ee1 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;apply=yes \
-	file://110-arm-eabi.patch;apply=yes \
-	file://200-uclibc-locale.patch;apply=yes \
-	file://300-libstdc++-pic.patch;apply=yes \
-	file://301-missing-execinfo_h.patch;apply=yes \
-	file://302-c99-snprintf.patch;apply=yes \
-	file://303-c99-complex-ugly-hack.patch;apply=yes \
-	file://304-index_macro.patch;apply=yes \
-	file://602-sdk-libstdc++-includes.patch;apply=yes \
-	file://740-sh-pr24836.patch;apply=yes \
-	file://800-arm-bigendian.patch;apply=yes \
-	file://801-arm-bigendian-eabi.patch;apply=yes \
-	file://arm-nolibfloat.patch;apply=yes \
-	file://arm-softfloat.patch;apply=yes \
-	file://gcc41-configure.in.patch;apply=yes \
-	file://arm-thumb.patch;apply=yes \
-	file://arm-thumb-cache.patch;apply=yes \
-	file://ldflags.patch;apply=yes \
-	file://cse.patch;apply=yes \
-	file://zecke-xgcc-cpp.patch;apply=yes \
-	file://unbreak-armv4t.patch;apply=yes \
-        file://fix-ICE-in-arm_unwind_emit_set.diff;apply=yes \
-        file://gcc-4.1.1-pr13685-1.patch;apply=yes \
-        file://gcc-ignore-cache.patch;apply=yes \
+	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;apply=yes "
+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;apply=yes \
-                         file://ppc-sfp-long-double-gcc411-7.patch;apply=yes "
+SRC_URI_append_linux = " file://ppc-gcc-41-20060515.patch \
+                         file://ppc-sfp-long-double-gcc411-7.patch "
 
 
 #Set the fortran bits
diff --git a/recipes/mamona/gcc-noemu_4.1.2.bb b/recipes/mamona/gcc-noemu_4.1.2.bb
index 86be907..05cdeb0 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;apply=yes \
-	file://110-arm-eabi.patch;apply=yes \
-	file://200-uclibc-locale.patch;apply=yes \
-	file://300-libstdc++-pic.patch;apply=yes \
-	file://301-missing-execinfo_h.patch;apply=yes \
-	file://302-c99-snprintf.patch;apply=yes \
-	file://303-c99-complex-ugly-hack.patch;apply=yes \
-	file://304-index_macro.patch;apply=yes \
-	file://602-sdk-libstdc++-includes.patch;apply=yes \
-	file://740-sh-pr24836.patch;apply=yes \
-	file://800-arm-bigendian.patch;apply=yes \
-	file://arm-nolibfloat.patch;apply=yes \
-	file://arm-softfloat.patch;apply=yes \
-	file://gcc41-configure.in.patch;apply=yes \
-	file://arm-thumb.patch;apply=yes \
-	file://arm-thumb-cache.patch;apply=yes \
-	file://ldflags.patch;apply=yes \
-	file://zecke-xgcc-cpp.patch;apply=yes \
-	file://unbreak-armv4t.patch;apply=yes \
-        file://fix-ICE-in-arm_unwind_emit_set.diff;apply=yes \
-	file://cache-amnesia.patch;apply=yes \
-	file://gfortran.patch;apply=yes \
-        file://gcc-4.0.2-e300c2c3.patch;apply=yes \
-        file://pr34130.patch;apply=yes \
+	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;apply=yes "
+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;apply=yes \
-#           file://200-uclibc-locale.patch;apply=yes \
-#           file://300-libstdc++-pic.patch;apply=yes \
-           file://301-missing-execinfo_h.patch;apply=yes \
-           file://302-c99-snprintf.patch;apply=yes \
-           file://303-c99-complex-ugly-hack.patch;apply=yes \
-           file://304-index_macro.patch;apply=yes \
-           file://602-sdk-libstdc++-includes.patch;apply=yes \
-           file://gcc41-configure.in.patch;apply=yes \
-           file://ldflags.patch;apply=yes \
-           file://zecke-xgcc-cpp.patch;apply=yes \
-           file://cache-amnesia.patch;apply=yes \
+#           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() {
diff --git a/recipes/maradns/maradns_1.0.39.bb b/recipes/maradns/maradns_1.0.39.bb
index eebba46..19957c6 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;apply=yes;striplevel=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 f12ceef..fb59151 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;apply=yes;striplevel=0 \
-           file://compile-1.4.0.3.patch;apply=yes "
+           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 0a2d296..0fc7bae 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;apply=yes \
+	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 204ee1a..a201291 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;apply=yes \
-           file://mbinputmgr-libgtkinput.patch;apply=yes \
-	   file://visibility-protocol.patch;apply=yes \
+	   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 f4d69bc..b3666b2 100644
--- a/recipes/matchbox-common/matchbox-common_0.9.1.bb
+++ b/recipes/matchbox-common/matchbox-common_0.9.1.bb
@@ -6,8 +6,8 @@ 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;apply=yes \
-           file://add-media-category.patch;apply=yes"
+           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 053f332..d209414 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;apply=yes;striplevel=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 f905735..cd44bd9 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;apply=yes"
+	   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 d8bf6f8..c63a64f 100644
--- a/recipes/matchbox-desktop/matchbox-desktop_0.9.1.bb
+++ b/recipes/matchbox-desktop/matchbox-desktop_0.9.1.bb
@@ -5,8 +5,8 @@ SECTION = "x11/wm"
 PR = "r4"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2 \
-           file://pkgconfig_fix.patch;apply=yes \
-           file://mb-desktop-multi-category-matching.patch;apply=yes"
+           file://pkgconfig_fix.patch \
+           file://mb-desktop-multi-category-matching.patch"
 
 RDEPENDS += "matchbox-common"
 
diff --git a/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
index f83f495..bbe8874 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;apply=yes \
-        file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;apply=yes \
-        file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;apply=yes \
-        file://4-Add-rendering-debug-logging.patch;apply=yes \
-        file://5-Add-support-for-loading-multiple-independent-layouts.patch;apply=yes \
-        file://6-Add-layout-switch-key-to-all-layouts.patch;apply=yes \
-        file://7-Newer-autotools.patch;apply=yes \
+	    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;apply=yes"
-SRC_URI_append_om-gta02 = " file://fic-gta01-font-size.patch;apply=yes"
+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 7ed9006..d3ea264 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;apply=yes \
-           file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;apply=yes \
-           file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;apply=yes \
-           file://4-Add-rendering-debug-logging.patch;apply=yes \
-           file://5-Add-support-for-loading-multiple-independent-layouts.patch;apply=yes \
-           file://6-Add-layout-switch-key-to-all-layouts.patch;apply=yes \
+           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 8135fd8..55497e9 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;apply=yes \
-	   file://sanitize-desktop-file.patch;apply=yes \
+           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 ce70825..1b65c7b 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;apply=yes \
-	file://more-automake-lossage.patch;apply=yes \
-	file://make-batteryapp-less-strict.patch;apply=yes"
+	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 ada4577..1bdc472 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;apply=yes \
-	file://wifi-location.patch;apply=yes"
+	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 85d581c..e7c9e2c 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;apply=yes \
-	   file://no_time_support.patch;apply=yes"
+           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 aafb6d9..b682738 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;apply=yes \
-           http://handhelds.org/~pb/mb-panel-0.9.2-polling.patch;apply=yes;name=patch1 \
-           http://handhelds.org/~pb/mb-panel-0.9.2-msgcancel.patch;apply=yes;name=patch2 \
-           file://mb-applet-battery-repaint.patch;apply=yes \
-           file://mb-panel-multi-category-matching.patch;apply=yes \
-           file://mb-panel-allow-disabling-menu-panel.patch;apply=yes \
-	   file://system-monitor-crash-fix.patch;apply=yes "
+           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 8046ec9..ff49aba 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;apply=yes \
-	   file://mb-applet-system-monitor-crash.patch;apply=yes \
-	   file://matchbox-panel-uninitialised-crash.patch;apply=yes"
+	   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 0a4d273..5a66719 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;apply=yes \
-           file://select-client-crash.patch;apply=yes \
+           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 77be5d9..bf7557d 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;apply=yes;striplevel=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 f1d911f..36a6c0f 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;apply=yes;striplevel=0 \
-	   file://startup-invalid-access.patch;apply=yes;striplevel=0 \
-	   file://startup-shown-uninitialized.patch;apply=yes;striplevel=0 \
-	   file://themeable-icons.patch;apply=yes;striplevel=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 3ad8a0f..d38f03b 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;apply=yes \
-	   file://makefile-vars.patch;apply=yes;striplevel=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 4108bd2..38ed0c2 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;apply=yes"
+	   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 f91d91b..5c3a93a 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;apply=yes"
+	   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 9d53351..da49427 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;apply=yes \
-	   file://mc-utf8.patch;apply=yes \
-	   file://00-70-utf8-common.patch;apply=yes \
-	   file://00-73-utf8-bottom-buttons-width.patch;apply=yes \
-	   file://00-75-utf8-cmdline-help.patch;apply=yes \
-	   file://00-76-utf8-hotlist-highlight.patch;apply=yes \
-	   file://00-77-utf8-filename-search-highlight.patch;apply=yes \
-	   file://mc-utf8-nlink.patch;apply=yes \
-	   file://mc-utf8-look-and-feel.patch;apply=yes \
-	   file://mc-utf8-slang-codeset.patch;apply=yes \
-	   file://99_regexp-replace-fixed.patch;apply=yes \
-	   file://99b_fix-regex-pattern-lengths.patch;apply=yes \
-	   file://multi-press-f-keys.patch;apply=yes \
-	   file://cross-compile.patch;apply=yes \
-	   file://01_ftpfs_symlink.patch;apply=yes \
-	   file://02_ignore_ftp_chmod_error.patch;apply=yes \
-	   file://mc-cursor-appearance.patch;apply=yes \
-	   file://mc-esc-seq.patch;apply=yes"
+	   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 6406792..75c2178 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;apply=yes "
+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 0218efd..7906d83 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;apply=yes"
+           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 b9d9247..b9b4dab 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;apply=yes \
-	   file://inotify.diff;apply=yes \
+           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 78ff7c5..5b29e2f 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;apply=yes"
+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 c5629d2..611beb7 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;apply=yes"
+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
index 2142300..721345d 100644
--- a/recipes/memtester/memtester_4.1.3.bb
+++ b/recipes/memtester/memtester_4.1.3.bb
@@ -3,7 +3,7 @@ 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;apply=yes"
+SRC_URI += "file://Makefile.patch"
 
 SRC_URI[md5sum] = "e562451620cf5343016950462bc0dc38"
 SRC_URI[sha256sum] = "ac56f0b6d6d6e58bcf2a3fa7f2c9b29894f5177871f21115a1906c535106acf6"
diff --git a/recipes/mesa/mesa-common-old.inc b/recipes/mesa/mesa-common-old.inc
index 3687bf5..01f0adc 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;apply=yes"
+	file://mklib-rpath-link.patch"
 
 S = "${WORKDIR}/Mesa-${PV}"
 
diff --git a/recipes/mesa/mesa-dri_6.5.2.bb b/recipes/mesa/mesa-dri_6.5.2.bb
index 448374f..323d20f 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;apply=yes"
+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 bf9aeda..3ce7d98 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;apply=yes"
+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
index 0219cce..1d8e764 100644
--- a/recipes/mesa/mesa-dri_7.8.1.bb
+++ b/recipes/mesa/mesa-dri_7.8.1.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;apply=yes \
-	   file://glamo.patch;apply=yes \
+	   file://fix-progs-makefile.patch \
+	   file://glamo.patch \
           "
 SRC_URI[archive.md5sum] = "25ec15f8e41fde6d206118cc786dbac4"
 SRC_URI[archive.sha256sum] = "b0b46e5abfd75db44501e308125fa92bcf1c91d91e97a043a3b1764cfa0907fa"
diff --git a/recipes/mesa/mesa-dri_7.8.bb b/recipes/mesa/mesa-dri_7.8.bb
index d62d565..c5f95ff 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;apply=yes \
-	   file://glamo.patch;apply=yes \
+	   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 47b185a..5f72641 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;apply=yes"
-SRC_URI_shr_append = " file://fix-progs-makefile.patch;apply=yes"
+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 bd10afa..2f98eed 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;apply=yes \
-        file://fix-host-compile.patch;apply=yes \
-        file://fix-progs-makefile.patch;apply=yes \
+        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.bb b/recipes/mesa/mesa-xlib_7.8.bb
index 098e6f4..6c0e7ea 100644
--- a/recipes/mesa/mesa-xlib_7.8.bb
+++ b/recipes/mesa/mesa-xlib_7.8.bb
@@ -7,7 +7,7 @@ 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;apply=yes \
+           file://fix-progs-makefile.patch \
           "
 
 SRC_URI[archive.md5sum] = "85cb891eecb89aae4fdd3499cccd934b"
diff --git a/recipes/mesa/mesa_6.0.1.bb b/recipes/mesa/mesa_6.0.1.bb
index ad9a1e1..3b37b8f 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;apply=yes \
-	file://mklib.patch;apply=yes"
+	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 557f98a..0ecd04f 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;apply=yes"
+	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 49aa5d1..8573ce3 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;apply=yes "
+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 2d45faa..96dd966 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;apply=yes "
+SRC_URI_append = " file://fix-host-compile.patch "
 
 SRC_URI[md5sum] = "93e6ed7924ff069a4f883b4fce5349dc"
 SRC_URI[sha256sum] = "9d4707b556960f6aef14480f91fcd4f868720f64321947ab1b2fd20e85ce7f9e"
diff --git a/recipes/metalog/metalog_0.7.bb b/recipes/metalog/metalog_0.7.bb
index 870e639..c6f92f5 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;apply=yes"
+           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 fabb2b9..0289f3c 100644
--- a/recipes/mgetty/mgetty_1.1.30.bb
+++ b/recipes/mgetty/mgetty_1.1.30.bb
@@ -8,7 +8,7 @@ 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;apply=yes \
+           file://debian.patch \
            file://00-g3_Makefile;apply=yes \
            file://01-adjust-path;apply=yes \
            file://02-pending-fix-includes;apply=yes \
@@ -37,9 +37,9 @@ SRC_URI = "http://nslu.sf.net/downloads/mgetty_1.1.30.orig.tar.gz \
            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;apply=yes \
-	   file://newslock_ldflags.patch;apply=yes \
-	   file://faxqhelper_ldflags.patch;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 aba0a00..5d09b36 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;apply=yes \
+           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 3309981..1fb7af1 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;apply=yes"
+           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 e34d443..22a6437 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;apply=yes"
+	   file://make.patch"
 S = "${WORKDIR}"
 
 do_install () {
diff --git a/recipes/microwindows/microwindows-snapshot.bb b/recipes/microwindows/microwindows-snapshot.bb
index f7e29c3..05bc70d 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;apply=yes \
-  file://makefilerules.patch;apply=yes \
+  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 4f499c7..d6ed3d3 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;apply=yes \
-  file://nochown.patch;apply=yes \
+  file://pagesize.patch \
+  file://nochown.patch \
  "
 
 
diff --git a/recipes/microwindows/microwindows_0.91.bb b/recipes/microwindows/microwindows_0.91.bb
index 53d8682..54254a9 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;apply=yes \
-  file://staticwin.patch;apply=yes \
+  file://pagesize.patch \
+  file://staticwin.patch \
  "
 
 
diff --git a/recipes/microwindows/nxlib_0.45.bb b/recipes/microwindows/nxlib_0.45.bb
index d80209a..22367a0 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;apply=yes \
+  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 5b63ff9..4f63d6d 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;apply=yes \
+	file://fix-openfile.patch \
   file://midpath-suitemanager \
   file://midpath-launcher-j2se \
   file://midpath-suitemanager.desktop \
diff --git a/recipes/mikmod/mikmod_3.2.2-beta1.bb b/recipes/mikmod/mikmod_3.2.2-beta1.bb
index 4f1872c..91b140b 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;apply=yes"
+           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 74da233..2f5ab14 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;apply=yes \
-	 file://remove-CC.patch;apply=yes \
+	 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 365ceef..8e358d1 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;apply=yes;striplevel=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 9dca29b..36880a2 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;apply=yes \
-	file://gcc4-scope.patch;apply=yes \
-	file://gcc4-scope2.patch;apply=yes"
+	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 36873b6..69939e6 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;apply=yes \
+	file://rename-conflicting-functions.patch \
 	"
 
 inherit autotools gettext
diff --git a/recipes/minilite/minilite.inc b/recipes/minilite/minilite.inc
index 7302d2a..0804920 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;apply=yes"
+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 5fede60..890744d 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;apply=yes"
+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 31d3b83..cd2e75e 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;apply=yes \
-	   file://fix-include.patch;apply=yes \
+	   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 578f487..913a388 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;apply=yes;striplevel=0 \
-        file://outputfix.patch;apply=yes;striplevel=0"
+        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/mktemp/mktemp_1.6.bb b/recipes/mktemp/mktemp_1.6.bb
index 878b62e..d0312d5 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;apply=yes \
-  file://disable-strip.patch;apply=yes \
+  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 55ce7eb..cd91545 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;apply=yes \
+           file://mathview-gcc43x.diff \
 	  "
 
 inherit autotools 
diff --git a/recipes/moblin/hornsey_git.bb b/recipes/moblin/hornsey_git.bb
index ff4f207..6b1eb03 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;apply=yes \
+           file://fix-api.patch \
 "
 S = "${WORKDIR}/git"
 
diff --git a/recipes/moblin/moblin-menus_git.bb b/recipes/moblin/moblin-menus_git.bb
index 8274da5..b61ef2d 100644
--- a/recipes/moblin/moblin-menus_git.bb
+++ b/recipes/moblin/moblin-menus_git.bb
@@ -1,6 +1,6 @@
 
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \
-           file://configurefix.patch;apply=yes"
+           file://configurefix.patch"
 PV = "0.0+git${SRCREV}"
 PR = "r1"
 
diff --git a/recipes/modphp/modphp5.inc b/recipes/modphp/modphp5.inc
index 29cc599..6e6d570 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;apply=yes \
+	   file://configure.patch \
 	  "
 
 S = "${WORKDIR}/php-${PV}"
diff --git a/recipes/module-init-tools/module-init-tools.inc b/recipes/module-init-tools/module-init-tools.inc
index de4b335..3cfaf11 100644
--- a/recipes/module-init-tools/module-init-tools.inc
+++ b/recipes/module-init-tools/module-init-tools.inc
@@ -16,7 +16,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-i
 	   file://modutils_extension;apply=yes \
 	   file://no_man_rebuild;apply=yes \
 	   file://manpagesopt;apply=yes \
-           file://module-init-tools-remove-index.patch;apply=yes "
+           file://module-init-tools-remove-index.patch "
 S = "${WORKDIR}/module-init-tools-${PV}"
 
 EXTRA_OECONF = "--disable-manpages"
diff --git a/recipes/modutils/modutils-cross_2.4.27.bb b/recipes/modutils/modutils-cross_2.4.27.bb
index 063e670..5eb9ca2 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;apply=yes"
+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 a5ae4ba..450cdd5 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;apply=yes \
-           file://modutils-notest.patch;apply=yes \
-           file://configure.patch;apply=yes \
-           file://program_prefix.patch;apply=yes \
-           file://armeb.patch;apply=yes \
-	   file://gcc4.patch;apply=yes"
+           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 68be3b7..63cf813 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;apply=yes"
+	   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 993ec51..6785148 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;apply=yes"
+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 7149e25..4bdeeb8 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;apply=yes \
+	file://no-strip-in-makefile.patch \
 	file://init"
 
 INITSCRIPT_NAME = "monit"
diff --git a/recipes/mono/mono-mcs-intermediate.inc b/recipes/mono/mono-mcs-intermediate.inc
index ff69227..ee00550 100644
--- a/recipes/mono/mono-mcs-intermediate.inc
+++ b/recipes/mono/mono-mcs-intermediate.inc
@@ -8,7 +8,7 @@
 PR = "r0"
 DEPENDS = "mono-native glib-2.0-native perl-native"
 
-SRC_URI += "file://mono-fix-libdir-path.patch;apply=yes"
+SRC_URI += "file://mono-fix-libdir-path.patch"
 
 # Inherit native to set up compiler and paths ...
 inherit native
diff --git a/recipes/mono/mono_2.6.3.bb b/recipes/mono/mono_2.6.3.bb
index fd34928..dbbe679 100644
--- a/recipes/mono/mono_2.6.3.bb
+++ b/recipes/mono/mono_2.6.3.bb
@@ -7,7 +7,7 @@ PR = "${INC_PR}.0"
 # mono makes use of non-thumb-compatible inline asm.
 ARM_INSTRUCTION_SET = "arm"
 
-SRC_URI += "file://configure.patch;apply=yes\
+SRC_URI += "file://configure.patch\
            "
 
 # Per http://www.mono-project.com/Mono:ARM
diff --git a/recipes/monotone/monotone-5_0.25.2.bb b/recipes/monotone/monotone-5_0.25.2.bb
index e31f77d..c067590 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;apply=yes \
-	   file://uclibc.database.hh.stdarg.patch;apply=yes \
-	   file://configure.ac-no-sync-with-stdio-0.25.patch;apply=yes \
+           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 2a75b39..27d81f9 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;apply=yes \
-	   file://uclibc.database.hh.stdarg.patch;apply=yes \
-           file://configure.ac-no-sync-with-stdio-0.26.patch;apply=yes \
+           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 5447a52..10ddf4d 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;apply=yes \
-	   file://uclibc.database.hh.stdarg.patch;apply=yes \
-	   file://configure.ac-no-sync-with-stdio-0.31.patch;apply=yes \
+           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 71ff753..8bc24f2 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;apply=yes \
-	   file://uclibc.database.hh.stdarg.patch;apply=yes \
-	   file://configure.ac-no-sync-with-stdio-0.31.patch;apply=yes \
+           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 3a9af2c..9a66952 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;apply=yes \
-	   file://uclibc.database.hh.stdarg.patch;apply=yes \
-	   file://configure.ac-no-sync-with-stdio-0.31.patch;apply=yes \
+           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 3e61c7e..716a26b 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;apply=yes \
-#	   file://uclibc.database.hh.stdarg.patch;apply=yes \
-	   file://configure.ac-no-sync-with-stdio-0.31.patch;apply=yes \
+           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 5f61999..d43ed27 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;apply=yes "
+           file://ffmpeg-0.4.9.15594svn-20081010.diff "
 
 inherit autotools
 
diff --git a/recipes/mozilla/fennec_hg.bb b/recipes/mozilla/fennec_hg.bb
index bca47f1..482ea1d 100644
--- a/recipes/mozilla/fennec_hg.bb
+++ b/recipes/mozilla/fennec_hg.bb
@@ -7,9 +7,9 @@ PE = "1"
 
 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;apply=yes \
+           file://use-native-bpp.patch \
            file://jsautocfg.h \
-           file://jsautocfg-dontoverwrite.patch;apply=yes \
+           file://jsautocfg-dontoverwrite.patch \
 "
 
 S = "${WORKDIR}/mozilla-central"
diff --git a/recipes/mozilla/firefox_1.0.7.bb b/recipes/mozilla/firefox_1.0.7.bb
index b7340cc..f8f5d97 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;apply=yes \
-	file://no-xmb.patch;apply=yes \
-	file://firefox-cc-fix.patch;apply=yes \
+	file://xptcstubs.patch \
+	file://no-xmb.patch \
+	file://firefox-cc-fix.patch \
 	file://jsautocfg.h \
-	file://extensions-hack.patch;apply=yes \
-	file://firefox-1.0-gcc4-compile.patch;apply=yes;striplevel=0 \
-	file://xptcinvoke-arm.patch;apply=yes \
-	file://mozilla-eabi.patch;apply=yes"
+	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 3ce38bd..7a0f38d 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;apply=yes \
-	file://no-xmb.patch;apply=yes \
+	file://xptcstubs.patch \
+	file://no-xmb.patch \
 	file://jsautocfg.h \
-	file://extensions-hack.patch;apply=yes \
-	file://security-cross.patch;apply=yes \
-	file://jsautocfg-dontoverwrite.patch;apply=yes \
-	file://xptcinvoke-arm.patch;apply=yes \
-	file://eabi-fix.patch;apply=yes \
-	file://eabi-fix2.patch;apply=yes \
-	file://eabi-fix3.patch;apply=yes \
-	file://linkage-problem.patch;apply=yes \
+	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 96894f7..0e62cbe 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;apply=yes \
-	file://jsautocfg-dontoverwrite.patch;apply=yes \
-	file://Bug339782.additional.fix.diff;apply=yes \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;apply=yes \
-	file://Bug405992.atomic.nspr.diff;apply=yes \
-	file://random_to_urandom.diff;apply=yes \
-	file://jemalloc-tls.patch;apply=yes \
-	file://wchart.diff;apply=yes \
-	file://0001-Remove-Werror-from-build.patch;apply=yes \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;apply=yes \
-	file://use-native-bpp.patch;apply=yes \
+	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 555145a..988c435 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;apply=yes \
-	file://jsautocfg-dontoverwrite.patch;apply=yes \
-	file://Bug339782.additional.fix.diff;apply=yes \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;apply=yes \
-	file://Bug405992.atomic.nspr.diff;apply=yes \
-	file://random_to_urandom.diff;apply=yes \
-	file://jemalloc-tls.patch;apply=yes \
-	file://0001-Remove-Werror-from-build.patch;apply=yes \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;apply=yes \
-	file://plugins-dir.patch;apply=yes \
+	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 3518d91..a4659ec 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;apply=yes \
-	file://jsautocfg-dontoverwrite.patch;apply=yes \
-	file://Bug339782.additional.fix.diff;apply=yes \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;apply=yes \
-	file://Bug405992.atomic.nspr.diff;apply=yes \
-	file://jemalloc-tls.patch;apply=yes \
-	file://0001-Remove-Werror-from-build.patch;apply=yes \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;apply=yes \
-	file://plugins-dir.patch;apply=yes \
+	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 ef12924..8bd30f2 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;apply=yes \
-	file://random_to_urandom.diff;apply=yes \
+	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 a7704f5..8ef9f5f 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;apply=yes \
+	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 b4a4409..d77c71d 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;apply=yes \
-	file://jsautocfg-dontoverwrite.patch;apply=yes \
-	file://Bug339782.additional.fix.diff;apply=yes \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;apply=yes \
-	file://Bug405992.atomic.nspr.diff;apply=yes \
-	file://jemalloc-tls.patch;apply=yes \
-	file://0001-Remove-Werror-from-build.patch;apply=yes \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;apply=yes \
-	file://plugins-dir.patch;apply=yes \
+	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 58a63f1..9331294 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;apply=yes \
-	file://jsautocfg-dontoverwrite.patch;apply=yes \
-	file://Bug339782.additional.fix.diff;apply=yes \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;apply=yes \
-	file://Bug405992.atomic.nspr.diff;apply=yes \
-	file://jemalloc-tls.patch;apply=yes \
-	file://0001-Remove-Werror-from-build.patch;apply=yes \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;apply=yes \
-	file://plugins-dir.patch;apply=yes \
+	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 6bb1f36..8da7d3a 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;apply=yes \
-	file://jsautocfg-dontoverwrite.patch;apply=yes \
-	file://Bug339782.additional.fix.diff;apply=yes \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;apply=yes \
-	file://Bug405992.atomic.nspr.diff;apply=yes \
-	file://jemalloc-tls.patch;apply=yes \
-	file://0001-Remove-Werror-from-build.patch;apply=yes \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;apply=yes \
-	file://plugins-dir.patch;apply=yes \
+	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 a22108e..3fbbf2a 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;apply=yes \
+	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 8043a25..dcc9fc5 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;apply=yes \
-	file://Bug339782.additional.fix.diff;apply=yes \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;apply=yes \
-	file://Bug405992.atomic.nspr.diff;apply=yes \
-	file://jemalloc-tls.patch;apply=yes \
-	file://0001-Remove-Werror-from-build.patch;apply=yes \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;apply=yes \
-	file://plugins-dir.patch;apply=yes \
+	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
index fc6b1ca..98a0e40 100644
--- a/recipes/mozilla/firefox_3.6.3.bb
+++ b/recipes/mozilla/firefox_3.6.3.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;apply=yes \
-	file://Bug339782.additional.fix.diff;apply=yes \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;apply=yes \
-	file://Bug405992.atomic.nspr.diff;apply=yes \
-	file://jemalloc-tls.patch;apply=yes \
-	file://0001-Remove-Werror-from-build.patch;apply=yes \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;apply=yes \
-	file://plugins-dir.patch;apply=yes \
+	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.bb b/recipes/mozilla/firefox_3.6.bb
index 9d4b3c4..cb542cb 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;apply=yes \
-	file://Bug339782.additional.fix.diff;apply=yes \
-	file://Bug385583.nspr.jmp_buf.eabi.diff;apply=yes \
-	file://Bug405992.atomic.nspr.diff;apply=yes \
-	file://jemalloc-tls.patch;apply=yes \
-	file://0001-Remove-Werror-from-build.patch;apply=yes \
-	file://0002-Fix-security-cross-compile-cpu-detection-error.patch;apply=yes \
-	file://plugins-dir.patch;apply=yes \
+	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 e98fdcd..c6ea7d1 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;apply=yes \
+           file://jsautocfg-dontoverwrite.patch \
 "
 
 S = "${WORKDIR}/mozilla-central"
diff --git a/recipes/mozilla/minimo_cvs.bb b/recipes/mozilla/minimo_cvs.bb
index 3d325d6..3c274ea 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;apply=yes \
-           file://bug-322806.diff;apply=yes \
+	   file://minimo.patch \
+           file://bug-322806.diff \
 	   file://mozconfig file://minimo \
-	   file://eabi-fix.patch;apply=yes \
-	   file://eabi-fix2.patch;apply=yes \
-	   file://eabi-fix3.patch;apply=yes \
-	   file://minimo-components-ssr-only.patch;apply=yes \
-	   file://minimo-disable-mode-switch.patch;apply=yes \
+	   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 247f4b4..3aa3864 100644
--- a/recipes/mozilla/nspr-tools-native_4.7.1.bb
+++ b/recipes/mozilla/nspr-tools-native_4.7.1.bb
@@ -6,7 +6,7 @@ SRC_URI = "\
 	file://30_pkgconfig.dpatch;apply=yes \
 	file://81_sonames.dpatch;apply=yes \
 	file://99_configure.dpatch;apply=yes \
-	file://unbreak-build.diff;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 e6c4768..7120764 100644
--- a/recipes/mozilla/nspr_4.7.1.bb
+++ b/recipes/mozilla/nspr_4.7.1.bb
@@ -6,7 +6,7 @@ SRC_URI = "\
 	file://30_pkgconfig.dpatch;apply=yes \
 	file://81_sonames.dpatch;apply=yes \
 	file://99_configure.dpatch;apply=yes \
-	file://unbreak-build.diff;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 9966f08..a1b97eb 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;apply=yes \
-	file://25_entropy.patch;apply=yes \
-	file://38_hurd.patch;apply=yes \
-	file://38_kbsd.patch;apply=yes \
-	file://38_mips64_build.patch;apply=yes \
-	file://80_security_build.patch;apply=yes \
-	file://80_security_tools.patch;apply=yes \
-	file://81_sonames.patch;apply=yes \
-	file://85_security_load.patch;apply=yes \
-	file://90_realpath.patch;apply=yes \
-	file://91_build_pwdecrypt.patch;apply=yes \
-	file://95_add_spi+cacert_ca_certs.patch;apply=yes \
-	file://96_NSS_VersionCheck.patch;apply=yes \
-	file://97_SSL_RENEGOTIATE_TRANSITIONAL.patch;apply=yes \
-	file://build-fix.patch;apply=yes;striplevel=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 3c9b707..ac0947f 100644
--- a/recipes/mozilla/nss_3.12.bb
+++ b/recipes/mozilla/nss_3.12.bb
@@ -18,7 +18,7 @@ SRC_URI = "\
 	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;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 f460453..e7f4d37 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;apply=yes \
-	file://no-xmb.patch;apply=yes \
-	file://extensions-hack.patch;apply=yes \
-	file://firefox-1.0-gcc4-compile.patch;apply=yes;striplevel=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 4b6c85c..337d37e 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;apply=yes"
+	   file://includedir.patch"
 
 inherit autotools
 
diff --git a/recipes/mp3blaster/mp3blaster_3.2.0.bb b/recipes/mp3blaster/mp3blaster_3.2.0.bb
index 2fb34db..d57c3ac 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;apply=yes"
+	   file://includedir.patch"
 
 inherit autotools
 
diff --git a/recipes/mp3blaster/mp3blaster_3.2.3.bb b/recipes/mp3blaster/mp3blaster_3.2.3.bb
index 2ffcff5..4df85b3 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;apply=yes"
+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 c2e4adf..3a80a5a 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;apply=yes"
+           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 fe9ec4d..b9b0e7b 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;apply=yes"
+           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 e0261d2..fd64043 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;apply=yes \
-	   file://dont_use_mips_h_constraint.patch;apply=yes \
+           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 e067f9a..4566b48 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;apply=yes"
+           file://libao.m4.patch"
 
 inherit autotools
 
diff --git a/recipes/mplayer/mplayer-maemo_svn.bb b/recipes/mplayer/mplayer-maemo_svn.bb
index e310178..6851387 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;apply=yes \
-           file://pld-onlyarm5.patch;apply=yes \
-           file://makefile-nostrip.patch;apply=yes \
-           file://motion-comp-pld.patch;apply=yes \
-	   file://cfg-common-position.patch;apply=yes "
+           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;apply=yes"
+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 a5c10da..cb6ce51 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;apply=yes \
-           file://w100-configure.patch;apply=yes \
-           file://w100-Makefile.patch;apply=yes \
-           file://w100-video_out.patch;apply=yes \
-           file://w100-mplayer.patch;apply=yes \
-           file://pld-onlyarm5.patch;apply=yes \
-           file://makefile-nostrip.patch;apply=yes \
-           ${SOURCEFORGE_MIRROR}/libw100/mplayer-imageon.patch;apply=yes;name=imageon \
-           file://imageon-video_out.patch;apply=yes \
-	   file://powerpc-is-ppc.diff;apply=yes \
-           file://pxa_configure.patch;apply=yes \
-           file://pxa-video_out.patch;apply=yes \
+           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;apply=yes \
+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;apply=yes"
+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 cdcbaae..876c88b 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;apply=yes \
-           file://w100-configure-svn.patch;apply=yes \
-           file://w100-video_out.patch;apply=yes \
+           file://Makefile-codec-cfg.patch \
+           file://w100-configure-svn.patch \
+           file://w100-video_out.patch \
            file://w100-mplayer.patch;patch= \
-           file://pld-onlyarm5.patch;apply=yes \
-           file://makefile-nostrip-rc2.patch;apply=yes \
-           file://mplayer-imageon-svn.patch;apply=yes \
-           file://imageon-video_out.patch;apply=yes \
-           file://pxa_configure.patch;apply=yes \
-           file://pxa-video_out.patch;apply=yes \
-           file://motion-comp-pld.patch;apply=yes \
-	   file://ivtv-fix.patch;apply=yes "
+           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;apply=yes"
+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 990e14e..c08676a 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;apply=yes \
+   file://makefile-nostrip-svn.patch \
    "
 
 SRC_URI_append_armv7a = " \
-		file://omapfb.patch;apply=yes \
+		file://omapfb.patch \
 	   file://vo_omapfb.c \
 	   file://yuv.S \
 	  "
@@ -21,7 +21,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;apply=yes"
+SRC_URI_append_collie = "file://disable-executable-stack-test.patch"
 
 SRCREV = "e64bef6a821e12e4a2fabeae15a2dfeef2ab460b"
 
diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb
index f240cb7..ae24cdb 100644
--- a/recipes/mplayer/mplayer_svn.bb
+++ b/recipes/mplayer/mplayer_svn.bb
@@ -8,18 +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;apply=yes \
-	   file://mplayer-arm-pld.patch;apply=yes \
-	   file://mplayer-lavc-arm.patch;apply=yes \
-       file://fix-exp.diff;apply=yes;maxrev=30291 \
-	   file://fix-addrinfo.patch;apply=yes;maxrev=30302 \
-       file://fix-avconfig.diff;apply=yes;maxrev=30376 \
-	   file://fix-emu_qtx_api.diff;apply=yes;maxrev=30165 \
+	   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;apply=yes \
+		file://omapfb.patch \
 	   file://vo_omapfb.c \
 	   file://yuv.S \
 	  "
@@ -28,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;apply=yes"
+SRC_URI_append_collie = "file://disable-executable-stack-test.patch"
 
 PACKAGE_ARCH_collie = "collie"
 PACKAGE_ARCH_c7x0 = "c7x0"
diff --git a/recipes/mrxvt/mrxvt_0.5.2.bb b/recipes/mrxvt/mrxvt_0.5.2.bb
index 84da137..ceb16ac 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;apply=yes;striplevel=0;name=patch \
-           file://fix-compile.patch;apply=yes \
-           file://font-defaults.patch;apply=yes"
+           ${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 c859d81..eb61eef 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;apply=yes"
+SRC_URI += "file://itunes-5-fix.patch"
 
 SRC_URI[md5sum] = "87356d2750ad82388a58d901aa566465"
 SRC_URI[sha256sum] = "92d9abd2d0cabaea198b9434100ebf1d5524283de8df02b0f04d907b2274959b"
diff --git a/recipes/mtd/mtd-utils_1.1.0.bb b/recipes/mtd/mtd-utils_1.1.0.bb
index 9d3eeba..00aee3d 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;apply=yes \
-	    file://fix-ignoreerrors-git.patch;apply=yes \
-	    file://lzo_1x.patch;apply=yes"
+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 a5854df..4d73c83 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;apply=yes \
-	   file://fix-ignoreerrors-git.patch;apply=yes \
-	   file://lzo_1x-git.patch;apply=yes"
+	   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 8bb962d..75ff7b9 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;apply=yes \
-	   file://fix-ignoreerrors-git.patch;apply=yes \
-	   file://lzo_1x-git.patch;apply=yes"
+	   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 d478b94..375d8d7 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;apply=yes"
+	   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 6c20684..5f758bb 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;apply=yes \
-	file://mtools-makeinfo.patch;apply=yes \
-	file://plainio.patch;apply=yes \
-	file://use-sg_io.patch;apply=yes"
+	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 aaeb66d..f098bfa 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;apply=yes"
+	   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 552c11d..9695c08 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;apply=yes"
+           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 9d4d3e3..a27ddcb 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;apply=yes"
+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 9dd014c..2389637 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;apply=yes 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 fcd6cb9..6fa1586 100644
--- a/recipes/mutt/mutt_1.5.15.bb
+++ b/recipes/mutt/mutt_1.5.15.bb
@@ -13,7 +13,7 @@ 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.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;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 452b180..e6ae2f7 100644
--- a/recipes/mutt/mutt_1.5.19.bb
+++ b/recipes/mutt/mutt_1.5.19.bb
@@ -10,8 +10,8 @@ LICENSE = "GPL"
 PR = "r1"
 SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz \
            file://patch-1.5.19.sidebar.20090522.txt;apply=yes \
-	   file://529838-gnutls-autoconf.patch;apply=yes \
-           file://makedoc.patch;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 afc805d..8237a09 100644
--- a/recipes/mutt/mutt_1.5.4i.bb
+++ b/recipes/mutt/mutt_1.5.4i.bb
@@ -13,10 +13,10 @@ 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.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;apply=yes \
-	   file://posix1_lim.patch;apply=yes \
-	   file://keymap.h.patch;apply=yes \
-	   file://configure.patch;apply=yes"
+	   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 8e5c01a..700834d 100644
--- a/recipes/mutt/mutt_1.5.9i.bb
+++ b/recipes/mutt/mutt_1.5.9i.bb
@@ -14,11 +14,11 @@ 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.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;apply=yes \
-	   file://cppflags.patch;apply=yes \
-	   file://posix1_lim.patch;apply=yes \
-	   file://makedoc.patch;apply=yes "
-#	   file://configure.patch;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/mysql/mysql5_5.1.40.inc b/recipes/mysql/mysql5_5.1.40.inc
index 8622f83..eb64fc1 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;apply=yes \
-           file://plug.in.patch;apply=yes \
-           file://misc.m4.patch;apply=yes \
-           file://Makefile.am.patch;apply=yes \
-           file://fix_host_path.patch;apply=yes \
-	   file://configure-ps-cache-check.patch;apply=yes \
+           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 9941d77..d3a4bc9 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;apply=yes \
-           file://fix_host_path.patch;apply=yes \
-	   file://configure-ps-cache-check.patch;apply=yes \
+           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 c4920ce..43a3e3b 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;apply=yes"
+	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 2e5a9de..3cbf015 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;apply=yes \
-        file://mythplugins_wo_qtopengl.diff;apply=yes \
-        file://configure.patch;apply=yes \
-        file://mytharchive.pro.patch;apply=yes \
+        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 3eec523..18bfb76 100644
--- a/recipes/mythtv/mythtv_0.22+fixes.bb
+++ b/recipes/mythtv/mythtv_0.22+fixes.bb
@@ -26,7 +26,7 @@ ALLOW_EMPTY_${PN} = "1"
 QMAKE_PROFILES = "mythtv.pro"
 
 SRC_URI += " \
-        file://configure.patch;apply=yes \
+        file://configure.patch \
         "
 
 inherit qmake2 qt4x11
diff --git a/recipes/nail/nail_11.21.bb b/recipes/nail/nail_11.21.bb
index 5916c1b..26eece0 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;apply=yes"
+	   file://nail.spec.diff"
 
 S = "${WORKDIR}/nail-11.21/"
 
diff --git a/recipes/nautilus/nautilus-cd-burner_2.25.3.bb b/recipes/nautilus/nautilus-cd-burner_2.25.3.bb
index 4bbb89f..f6c0c81 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;apply=yes \
-             file://eject2.diff;apply=yes \
+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 08df45e..2b5054b 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;apply=yes"
+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 333d647..8b7d84a 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;apply=yes \
-            file://no-try-run-strftime.diff;apply=yes \
+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 e981b1d..6d1c052 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;apply=yes \
-            file://no-try-run-strftime.diff;apply=yes \
+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 bc48539..6b4f3b1 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;apply=yes \
-            file://no-try-run-strftime.diff;apply=yes \
+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 14b349b..1366c35 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;apply=yes \
-            file://no-try-run-strftime.diff;apply=yes \
+SRC_URI += "file://idl-sysroot.patch \
+            file://no-try-run-strftime.diff \
 "
 
 SRC_URI[archive.md5sum] = "e09aea66166c0a90d09955bd4d2672be"
diff --git a/recipes/navit/navit_0.0.4.bb b/recipes/navit/navit_0.0.4.bb
index 891de8d..cdd2e83 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;apply=yes"
+SRC_URI_append +=  "file://navit.xml-so.patch"
 
 SRC_URI[md5sum] = "c2ec1ddff62c2b248dbaeab1ab656d74"
 SRC_URI[sha256sum] = "c069e983ea8bb9b6706d35126350d4d14619b9ce0ac888adbcdda3ff13362ab4"
diff --git a/recipes/nbd/nbd_2.8.7.bb b/recipes/nbd/nbd_2.8.7.bb
index 8070633..2fe81cd 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;apply=yes "
+           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 a23f1fc..2c7a045 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;apply=yes"
+           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 58c14e7..57d1a3d 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;apply=yes \
-	   file://fixes.patch;apply=yes"
+	   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 01b7d8a..a6aed6d 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;apply=yes \
-           file://use_ldflags.patch;apply=yes \
-           file://visibility.patch;apply=yes"
+           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 103d116..7489947 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;apply=yes \
+	   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 2e4b947..65fb140 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;apply=yes \
-           file://gnutls-2.patch;apply=yes"
+           file://gnutls-force-and-detect.patch \
+           file://gnutls-2.patch"
 
 inherit autotools binconfig lib_package pkgconfig
 
diff --git a/recipes/net-snmp/net-snmp_5.1.2.bb b/recipes/net-snmp/net-snmp_5.1.2.bb
index 7db22c7..45694c3 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;apply=yes \
+	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 23407b6..bd97827 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;apply=yes \
+        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 da08f20..1f80cbc 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;apply=yes \
-        file://CVE-2008-6123.patch;apply=yes \
+        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 7cc0905..4e9d0fc 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;apply=yes \
-           file://net-tools-1.60-miiioctl.patch;apply=yes \
-           file://net-tools-1.60-manydevs.patch;apply=yes;striplevel=0 \
-           file://net-tools-1.60-virtualname.patch;apply=yes \
-           file://net-tools-1.60-cycle.patch;apply=yes \
-           file://net-tools-1.60-nameif.patch;apply=yes \
-           file://net-tools-1.60-ipx.patch;apply=yes \
-           file://net-tools-1.60-inet6-lookup.patch;apply=yes \
-           file://net-tools-1.60-man.patch;apply=yes \
-           file://net-tools-1.60-gcc33.patch;apply=yes \
-           file://net-tools-1.60-trailingblank.patch;apply=yes \
-           file://net-tools-1.60-interface.patch;apply=yes \
-           file://net-tools-1.60-gcc34.patch;apply=yes \
-           file://net-tools-1.60-overflow.patch;apply=yes \
-           file://net-tools-1.60-siunits.patch;apply=yes \
-           file://net-tools-1.60-trunc.patch;apply=yes \
-           file://net-tools-1.60-return.patch;apply=yes \
-           file://net-tools-1.60-parse.patch;apply=yes \
-           file://net-tools-1.60-netmask.patch;apply=yes \
-           file://net-tools-1.60-ulong.patch;apply=yes \
-           file://net-tools-1.60-bcast.patch;apply=yes \
-           file://net-tools-1.60-mii-tool-obsolete.patch;apply=yes \
-           file://net-tools-1.60-netstat_ulong.patch;apply=yes \
-           file://net-tools-1.60-note.patch;apply=yes \
-           file://net-tools-1.60-num-ports.patch;apply=yes \
-           file://net-tools-1.60-duplicate-tcp.patch;apply=yes \
-           file://net-tools-1.60-statalias.patch;apply=yes \
-           file://net-tools-1.60-isofix.patch;apply=yes \
-           file://net-tools-1.60-ifconfig_ib.patch;apply=yes \
-           file://net-tools-1.60-de.patch;apply=yes \
-           file://net-tools-1.60-pie.patch;apply=yes \
-           file://net-tools-1.60-ifaceopt.patch;apply=yes \
-           file://net-tools-1.60-trim_iface.patch;apply=yes \
-           file://net-tools-1.60-stdo.patch;apply=yes \
-           file://net-tools-1.60-statistics.patch;apply=yes \
-           file://net-tools-1.60-ifconfig.patch;apply=yes \
-           file://net-tools-1.60-arp_overflow.patch;apply=yes \
-           file://net-tools-1.60-hostname_man.patch;apply=yes \
-           file://net-tools-1.60-interface_stack.patch;apply=yes;striplevel=0 \
-           file://net-tools-1.60-selinux.patch;apply=yes \
-           file://net-tools-1.60-netstat_stop_trim.patch;apply=yes "
+           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"
 
diff --git a/recipes/netatalk/netatalk_2.0.5.bb b/recipes/netatalk/netatalk_2.0.5.bb
index 664fbf6..1408d42 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;apply=yes \
+	   file://netatalk-dbd.patch \
 	   file://netatalk.conf \
 	   file://init"
 SRC_URI[src.md5sum] = "f35cd7a4ce26c780de380cd2bcae5ce6"
diff --git a/recipes/netbook-launcher/liblauncher_0.3.8.bb b/recipes/netbook-launcher/liblauncher_0.3.8.bb
index 8c86835..43ba05a 100644
--- a/recipes/netbook-launcher/liblauncher_0.3.8.bb
+++ b/recipes/netbook-launcher/liblauncher_0.3.8.bb
@@ -6,7 +6,7 @@ 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;apply=yes \
+           file://0001-liblauncher-udpate-0.3.6-to-0.3.8-which-the-ubuntu-f.patch \
 "
 
 SRC_URI[liblauncher.md5sum] = "ba3ea890473f69000d1c843cee471471"
diff --git a/recipes/netkit-base/netkit-base_0.17.bb b/recipes/netkit-base/netkit-base_0.17.bb
index b2c52c5..c9864ae 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;apply=yes \
-           file://mconfig.patch;apply=yes \
+           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 691d7d1..86afb86 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;apply=yes \
-       http://ftp.de.debian.org/debian/pool/main/n/netkit-ftp/netkit-ftp_0.17-19.diff.gz;apply=yes;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 85e363c..3f97fc4 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;apply=yes \
-	   file://install.patch;apply=yes"
+	   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 abbd1d8..8aceb2e 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;apply=yes \
-           file://cross-compile.patch;apply=yes "
+           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 199802b..17b9d80 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;apply=yes"
+	   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 f15951f..0d57e25 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;apply=yes \
-           file://tftpd_add_debug.patch;apply=yes \
-	   file://pack_tftphdr.patch;apply=yes"
+	   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 7825f8b..de94abb 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;apply=yes;striplevel=42 \
-	   file://libgnuhash.patch;apply=yes \
+	   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 bdef21e..8a3e159 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;apply=yes \
+         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 dd88bb7..88a6ce7 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;apply=yes"
+           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 e9843f5..4845398 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;apply=yes"
+           file://libnsgif-strict-aliasing.patch"
 
 PR = "r1"
 
diff --git a/recipes/netsurf/netsurf_2.1.bb b/recipes/netsurf/netsurf_2.1.bb
index 1f7d8fb..3aeae0c 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;apply=yes \
-	   file://debugxml_fix.patch;apply=yes \
+	   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 554719a..34bc7bf 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;apply=yes"
+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 ee5eee2..1f72761 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;apply=yes;striplevel=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 bfdbd84..ea8c0a8 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;apply=yes;striplevel=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 9aafb6b..f7f9746 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;apply=yes \
-	file://dbus-1.0-fix.patch;apply=yes \
+	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 9bdd56b..e304332 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;apply=yes \
+           file://fix_seg_fault.patch \
           "
 
 SRC_URI_append_mamona = " \
-                    file://avoid_frequent_scan.patch;apply=yes \
-                    file://adding_no_scan_by_default.patch;apply=yes \
+                    file://avoid_frequent_scan.patch \
+                    file://adding_no_scan_by_default.patch \
                   "
 
-SRC_URI_append_nokia770 = " file://cx3110_bring_up.patch;apply=yes "
-SRC_URI_append_nokia800 = " file://cx3110_bring_up.patch;apply=yes "
-SRC_URI_append_nokia810 = " file://cx3110_bring_up.patch;apply=yes "
+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 abadd96..812f101 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;apply=yes \
+    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 6ba08e2..7bada30 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;apply=yes \
-	file://008-BACKEND-debian-fallback-to-generic-loopback.loom.patch;apply=yes \
-	file://02-dbus_access_network_manager.patch;apply=yes \
-	file://cx3110_bring_up.patch;apply=yes \
+	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 ab23788..35f6a33 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;apply=yes \
+    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 588a96b..64fdace 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;apply=yes \
-	file://008-BACKEND-debian-fallback-to-generic-loopback.loom.patch;apply=yes \
-	file://02-dbus_access_network_manager.patch;apply=yes \
-	file://add_probe_for_v250_modems.patch;apply=yes \
-	file://cx3110_bring_up.patch;apply=yes \
+	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;apply=yes "
+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 814c159..16cf9c5 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;apply=yes \
+            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 1379542..21aace0 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;apply=yes \
+    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 777fe59..39b0bf3 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;apply=yes \
+	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 d5e5817..b8bda2e 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;apply=yes \
-            file://no-restarts.diff;apply=yes;striplevel=0 \
+            file://define_kernel_types_for_old_linux_headers.patch \
+            file://no-restarts.diff;striplevel=0 \
            "
 
 S = "${WORKDIR}/trunk"
diff --git a/recipes/nfs-utils/nfs-utils_1.0.6.bb b/recipes/nfs-utils/nfs-utils_1.0.6.bb
index f7df531..e847c86 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;apply=yes \
-	file://rpcgen-lossage.patch;apply=yes \
-	file://stat-include.patch;apply=yes \
-	file://nfs-utils-1.0.6-uclibc.patch;apply=yes \
-	file://kernel-2.6.18+.patch;apply=yes \
-	file://uclibc_bzero_fix.patch;apply=yes \
+	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 9a6f235..a663a64 100644
--- a/recipes/nfs-utils/nfs-utils_1.1.2.bb
+++ b/recipes/nfs-utils/nfs-utils_1.1.2.bb
@@ -8,8 +8,8 @@ PR = "r7"
 DEPENDS = "util-linux-ng tcp-wrappers libevent"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
-	file://nfs-utils-tools-unset-cflags.patch;apply=yes \
-	file://nfs-utils-uclibc-compile.patch;apply=yes \
+	file://nfs-utils-tools-unset-cflags.patch \
+	file://nfs-utils-uclibc-compile.patch \
 	file://nfsserver \
    "
 
diff --git a/recipes/ngrep/ngrep_1.42.bb b/recipes/ngrep/ngrep_1.42.bb
index e83ff00..7e12eb1 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;apply=yes"
+           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 af4bf52..78174e1 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;apply=yes"
+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 e30b70e..2c24ddc 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;apply=yes"
-SRC_URI += " file://libdl.patch;apply=yes"
+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 105608d..4350c22 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;apply=yes \
-	   file://remove_gtk.patch;apply=yes"
+	   file://autofoo.patch \
+	   file://remove_gtk.patch"
 S = "${WORKDIR}/nmap-${PV}"
 
 EXTRA_OECONF = "--with-pcap=linux \
diff --git a/recipes/notecase/notecase.inc b/recipes/notecase/notecase.inc
index 69ee75e..983a2d4 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;apply=yes"
+           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 34786fa..99fc83a 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;apply=yes \
-file://fix-encoding.patch;apply=yes"
+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 0ff81c3..285b2e3 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;apply=yes"
+           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 e6b6e0a..366fafd 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;apply=yes"
+           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 759c43e..3a748b9 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;apply=yes \
+           file://nrlolsr-cross.patch \
           "
 
 do_compile () {
diff --git a/recipes/ntop/ntop_3.0.bb b/recipes/ntop/ntop_3.0.bb
index cf1c971..d8f4426 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;apply=yes \
-           file://plugins.patch;apply=yes"
+           file://autotools.patch \
+           file://plugins.patch"
 
 inherit autotools
 
diff --git a/recipes/ntp/ntp.inc b/recipes/ntp/ntp.inc
index e352f56..68b98db 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;apply=yes \
+	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 47427c0..24e9b05 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;apply=yes \
-	   file://readline.patch;apply=yes \
+	   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 8ff9b89..62342ca 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;apply=yes \
-	file://ipv6only-workaround.patch;apply=yes \
-        file://gcc4.patch;apply=yes \
+	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 d1807da..f21befe 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;apply=yes \
-        file://ntp-4.2.4_p6-nano.patch;apply=yes \
+	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 7c019e4..23920c6 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;apply=yes;striplevel=0 \
+  file://replay_off.patch;striplevel=0 \
   file://next.png \
-  file://keyb.patch;apply=yes;striplevel=0 \
+  file://keyb.patch;striplevel=0 \
   file://keyb.png \
-  file://faster.patch;apply=yes;striplevel=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 5ad4bcf..d1a0ff6 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;apply=yes \
-	file://nunome.patch;apply=yes"
+	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 08e31f9..f6bc606 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;apply=yes \
+    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 950ca8f..276043b 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;apply=yes"
+	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 3e7eb87..7a7d600 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;apply=yes"
+	file://nvidia-oe-conftest.patch"
 
 S="${WORKDIR}/${PKG_BASENAME}/usr/src/nv"
 
diff --git a/recipes/nvidia-drivers/nvidia-nforce_1.0-0310.bb b/recipes/nvidia-drivers/nvidia-nforce_1.0-0310.bb
index 7dc29df..31407eb 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;apply=yes"
+	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 c3e92d5..7b860b9 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;apply=yes \
-	   file://dodnx.patch;apply=yes \
-	   file://gcc-warnings.patch;apply=yes \
-	   file://restorekeyboard.patch;apply=yes \
-	   file://publicKey.patch;apply=yes \
-	   file://deletelogfiles.patch;apply=yes \
-	   file://ssh_dnserror.patch;apply=yes \
+	   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 0fd8372..04ddac0 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;apply=yes \
+	   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 2087a2a..5354125 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;apply=yes \
-	   file://stdarg.patch;apply=yes \
-	   file://link.patch;apply=yes \
+	   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 2b280ce..6a253a6 100644
--- a/recipes/nylon/nylon-scripts_cvs.bb
+++ b/recipes/nylon/nylon-scripts_cvs.bb
@@ -11,7 +11,7 @@ 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;apply=yes"
+	file://firewall-bash.diff"
 S = "${WORKDIR}/${PN}"
 PACKAGE_STRIP = "no"
 
diff --git a/recipes/nylon/simple-firewall.bb b/recipes/nylon/simple-firewall.bb
index 6705067..8e34f3a 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;apply=yes"
+	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 a673820..040f800 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;apply=yes \
-	   file://i-hate-libtool.patch;apply=yes \
-	   file://m4.patch;apply=yes"
+	   file://iconv.patch \
+	   file://i-hate-libtool.patch \
+	   file://m4.patch"
 
 inherit autotools gettext
 
diff --git a/recipes/obexpush/obexpush_1.0.0.bb b/recipes/obexpush/obexpush_1.0.0.bb
index d5e2985..5701c28 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;apply=yes \
+           file://add-obextool.patch \
            file://init \
            file://opd_args"
 S = "${WORKDIR}/obexpush"
diff --git a/recipes/octave/octave_2.9.19.bb b/recipes/octave/octave_2.9.19.bb
index ef2a840..d3d8f3e 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;apply=yes"
+           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 ddf02f5..017a91f 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;apply=yes"
+           file://configure.patch"
 
 PR = "r1"
 
diff --git a/recipes/octave/octave_3.0.3.bb b/recipes/octave/octave_3.0.3.bb
index 5d5e0ed..b994f61 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;apply=yes"
+           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 7cc512e..1383329 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;apply=yes"
+           file://install.patch"
 
 inherit autotools binconfig
 
diff --git a/recipes/ogre/ogre-egl_svn.bb b/recipes/ogre/ogre-egl_svn.bb
index 952acde..4e66e2e 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;apply=yes;striplevel=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 e9c6d38..7c2f676 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;apply=yes"
+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 b44e235..bd6efee 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;apply=yes"
+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 48cc18d..b48a928 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;apply=yes"
+           file://gcc-4.4.patch"
 
 inherit autotools
diff --git a/recipes/omnewrotate/omnewrotate_svn.bb b/recipes/omnewrotate/omnewrotate_svn.bb
index 9e8bd7a..316a8d0 100644
--- a/recipes/omnewrotate/omnewrotate_svn.bb
+++ b/recipes/omnewrotate/omnewrotate_svn.bb
@@ -11,7 +11,7 @@ PV = "0.5.8+svnr${SRCPV}"
 PR = "r1"
 
 SRC_URI = "svn://omnewrotate.googlecode.com/svn;module=trunk;proto=http \
-           file://xsession.script.patch;apply=yes"
+           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 10a3468..c5c550d 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;apply=yes \
+	  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 aa68a93..4f2be67 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;apply=yes \
-file://omniORB_embedded_appl.patch;apply=yes \
-file://rm_LongDouble.patch;apply=yes \
-file://arm_double.patch;apply=yes;striplevel=0 \
-file://dynskel.patch;apply=yes;striplevel=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 bd4b8db..a4c032c 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;apply=yes \ 
+file://omniorb_4.1.4.patch \ 
 file://omniORB.cfg \
-file://omniORB-cross.patch;apply=yes \
-file://omniORB_embedded_appl.patch;apply=yes \
-file://rm_LongDouble.patch;apply=yes \
+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 162220d..4c99405 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;apply=yes"
+	   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 154ba53..118264c 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;apply=yes \
+	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.bb b/recipes/openbmap/openbmap-logger_0.4.0.bb
index d6ad492..099694f 100644
--- a/recipes/openbmap/openbmap-logger_0.4.0.bb
+++ b/recipes/openbmap/openbmap-logger_0.4.0.bb
@@ -4,7 +4,7 @@ PR = "r1"
 
 SRC_URI = "\
 ${SOURCEFORGE_MIRROR}/myposition/openbmap-logger-${PV}.tar.gz \
-file://fsogsmd-fix.patch;apply=yes \
+file://fsogsmd-fix.patch \
 "
 
 inherit distutils
diff --git a/recipes/openchrome/xf86-video-openchrome_0.2.902.bb b/recipes/openchrome/xf86-video-openchrome_0.2.902.bb
index 527ce16..1d60ee0 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;apply=yes 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;patch=1"
 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 629a4a2..fad5026 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;apply=yes \
-           file://paddle.diff;apply=yes "
+           file://configure.diff \
+           file://paddle.diff "
 
 S = "${WORKDIR}/ARToolKit"
 
diff --git a/recipes/opencv/opencv_1.0.0.bb b/recipes/opencv/opencv_1.0.0.bb
index b696323..32ca2d0 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;apply=yes \
-          file://debian/010_ffmpeg_linking.diff;apply=yes \
-          file://debian/010_fix_optimisations.diff;apply=yes \
-          file://debian/010_m4_syntax.diff;apply=yes \
-          file://debian/010_makefile_syntax.diff;apply=yes \
-          file://debian/010_python_cspec.diff;apply=yes \
-          file://debian/020_python_linking.diff;apply=yes \
-          file://debian/030_install_hook.diff;apply=yes \
-          file://debian/050_rebootstrap.diff;apply=yes \
-          file://debian/100_amd64.diff;apply=yes \
-          file://debian/100_static_inline.diff;apply=yes \
-          file://debian/100_ffmpeg_updates.diff;apply=yes \
-          file://debian/110_dc1394.diff;apply=yes \
-          file://debian/120_header_warnings.diff;apply=yes \
-          file://debian/200_documentation.diff;apply=yes \
-          file://debian/200_examples_makefile.diff;apply=yes \
-          file://debian/210_openmp_compilation.diff;apply=yes \
-          file://debian/300_fix_segfault_in_window_gtk.diff;apply=yes \
+          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/openscenegraph_2.9.6.bb b/recipes/opencv/openscenegraph_2.9.6.bb
index 572f6d8..0118a46 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;apply=yes "
+           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 aded5e7..f28dbe5 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;apply=yes"
+	   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 3d64f13..4d86219 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;apply=yes"
+	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 ac88785..20e96ab 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;apply=yes \
-	   file://oj-native-libosp-fix.patch;apply=yes"
+	   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 311ddb2..c7ea360 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;apply=yes"
+	   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 b258742..39b6dd9 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;apply=yes \
+	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 9b89a86..8d17e47 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;apply=yes"
+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;apply=yes"
+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;apply=yes"
+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 cbf12c1..23b0dae 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;apply=yes"
+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;apply=yes"
+#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;apply=yes"
+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 348533b..7fb97c0 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;apply=yes"
+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;apply=yes"
+#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;apply=yes"
+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 a50acc6..127c1bd 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;apply=yes \
+           file://check.diff \
           "
 
 inherit autotools
diff --git a/recipes/openmoko-3rdparty/mcnavi_0.2.5.bb b/recipes/openmoko-3rdparty/mcnavi_0.2.5.bb
index e0f3249..d011ec9 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;apply=yes"
+           file://gpsd-2.90.patch"
 
 SRC_URI[archive.md5sum] = "b572c3691f05e22b37efd6cd53da203e"
 SRC_URI[archive.sha256sum] = "ee6792bef93070319141ee2020b7ae376527e3b8043f0f540bcd58d418576d44"
diff --git a/recipes/openmoko-projects/diversity-daemon_svn.bb b/recipes/openmoko-projects/diversity-daemon_svn.bb
index f18913e..09b3005 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;apply=yes;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 9c18153..5df6073 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;apply=yes;striplevel=2"
+file://fix-configure-for-new-autotools.patch;striplevel=2"
 
 S = "${WORKDIR}/trunk"
 
diff --git a/recipes/openmoko2/libmokoui2_svn.bb b/recipes/openmoko2/libmokoui2_svn.bb
index 46df771..478f3f5 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;apply=yes \
-	file://makefile.am.patch;apply=yes \
+	file://configure.patch \
+	file://makefile.am.patch \
 	"
 LICENSE = "LGPL"
 
diff --git a/recipes/openmoko2/neod_svn.bb b/recipes/openmoko2/neod_svn.bb
index b7c2179..eebb154 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;apply=yes;maxrev=3348 \
-            file://ipaq.patch;apply=yes;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 70a51c3..3d329b7 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;apply=yes;minrev=3646;maxrev=4171"
+SRC_URI += "file://webkit-update.patch;minrev=3646;maxrev=4171"
 
-#SRC_URI += "file://fingerscroll.diff;apply=yes"
+#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 675def1..33b90ff 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;apply=yes"
-SRC_URI_append_om-gta02 = " file://kernel-2.6.24.patch;apply=yes"
+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 a0d0b32..f1bf431 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;apply=yes \
-           file://adjtimex-${PV}.patch;apply=yes \
-           file://makefile-install.patch;apply=yes \
+           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 e2704d4..3ed2a0f 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;apply=yes \
+           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 b079107..6c756f6 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;apply=yes \
-	   file://libusb_crosscompile_check.patch;apply=yes"
+           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 ecd3308..af22687 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;apply=yes \
-           file://libusb_crosscompile_check.patch;apply=yes"
+           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 a7b7b87..fa08df7 100644
--- a/recipes/openobex/openobex_1.5.bb
+++ b/recipes/openobex/openobex_1.5.bb
@@ -8,8 +8,8 @@ LICENSE = "GPLv2/LGPLv2.1"
 PR = "r2"
 
 SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/openobex-${PV}.tar.gz \
-           file://disable-cable-test.patch;apply=yes \
-           file://libusb_crosscompile_check.patch;apply=yes"
+           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 e60326c..e6859e9 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;apply=yes"
+           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 5d2bef1..46024fe 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;apply=yes"
+           file://debian.patch"
 
 inherit autotools
 
diff --git a/recipes/openscada/openscada_svn.bb b/recipes/openscada/openscada_svn.bb
index 9b55ec6..deb0c76 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;apply=yes \
+           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 3bfafe7..9d8b626 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;apply=yes \
-		file://attributevalue.patch;apply=yes \
-		file://rangmap-fix.patch;apply=yes"
+		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 fc378df..13d0534 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;apply=yes \
-           file://attributevalue.patch;apply=yes \
-           file://rangmap-fix.patch;apply=yes \
-           file://fix-docdir.patch;apply=yes"
+           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 9f2e690..f63c7fa 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;apply=yes \
-           file://scp-nossl.patch;apply=yes \
+           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 8ee7a9e..7d8671c 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;apply=yes \
-           file://scp-nossl.patch;apply=yes \
+           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 70d1ee4..fe5a623 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;apply=yes \
-           file://scp-nossl.patch;apply=yes \
+           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 92bf1cd..4e595bf 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;apply=yes \
+           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 3adcc21..dba3785 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;apply=yes \
+           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 ccf8a8e..66eff25 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;apply=yes \
+           file://openssh-5.2-sftp-server-nolibcrypto.patch \
           "
 
 SRC_URI[md5sum] = "ada79c7328a8551bdf55c95e631e7dad"
diff --git a/recipes/openssl/openssl-native_0.9.7g.bb b/recipes/openssl/openssl-native_0.9.7g.bb
index 79ea490..229a9b2 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;apply=yes \
-            file://armeb.patch;apply=yes;striplevel=0 \
-            file://gnueabi-arm.patch;apply=yes"
+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 23f38dc..3b76dd5 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;apply=yes \
-            file://armeb.patch;apply=yes;striplevel=0 \
-            file://gnueabi-arm.patch;apply=yes"
+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 68372b4..bef8dfb 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;apply=yes \
-            file://configure-targets.patch;apply=yes \
-            file://shared-libs.patch;apply=yes"
+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 e658063..1b82645 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;apply=yes \
-            file://shared-libs.patch;apply=yes \
-            file://debian.patch;apply=yes"
+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 8614fb1..7029bfe 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;apply=yes \
-            file://shared-libs.patch;apply=yes \
-            file://debian.patch;apply=yes \
-	    file://libdeps-first.patch;apply=yes \
+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 5e873f5..6b13717 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;apply=yes \
-            file://armeb.patch;apply=yes \
-            file://gnueabi-arm.patch;apply=yes"
+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 bac3c5d..bf1043c 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;apply=yes \
-            file://armeb.patch;apply=yes;striplevel=0 \
-            file://gnueabi-arm.patch;apply=yes \
-            file://gnueabi-armeb.patch;apply=yes \
-            file://uclibcgnueabi.patch;apply=yes \
-            file://avr32.patch;apply=yes;striplevel=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 d429a50..28283ad 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;apply=yes \
-            file://armeb.patch;apply=yes;striplevel=0 \
-            file://gnueabi-arm.patch;apply=yes \
-            file://gnueabi-armeb.patch;apply=yes \
-            file://uclibcgnueabi.patch;apply=yes \
-            file://avr32.patch;apply=yes;striplevel=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 7aac9ea..d90e885 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;apply=yes \
-            file://configure-targets.patch;apply=yes \
-            file://shared-libs.patch;apply=yes"
+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 20d4956..a7eb332 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;apply=yes \
-            file://shared-libs.patch;apply=yes \
-            file://debian.patch;apply=yes \
-            file://oe-ldflags.patch;apply=yes"
+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 e29f856..8013ce7 100644
--- a/recipes/openssl/openssl_1.0.0.bb
+++ b/recipes/openssl/openssl_1.0.0.bb
@@ -11,12 +11,12 @@ DEFAULT_PREFERENCE = "-1"
 export DIRS = "crypto ssl apps engines"
 export OE_LDFLAGS="${LDFLAGS}"
 
-SRC_URI += "file://configure-targets.patch;apply=yes \
-            file://shared-libs.patch;apply=yes \
-            file://debian.patch;apply=yes \
-            file://oe-ldflags.patch;apply=yes \
-	    file://libdeps-first.patch;apply=yes \
-	    file://engines-install-in-libdir-ssl.patch;apply=yes \
+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 a1eb7ad..a0bf652 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;apply=yes \
-           file://gcc4-fixes.patch;apply=yes \
-           file://installflags.patch;apply=yes \
-	   file://makefile-whitespace-fix.patch;apply=yes \
-	   file://ld-library-path-breakage.patch;apply=yes"
+	   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 9d2490f..0f154cf 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;apply=yes \
-           file://installflags.patch;apply=yes \
-	   file://ld-library-path-breakage.patch;apply=yes"
+	   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 cc20a25..653635f 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;apply=yes \
-	file://syncml-client-plugin-cpp.patch;apply=yes"
+	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 d97e093..d3be52e 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;apply=yes \
-	   file://build-in-src.patch;apply=yes \
-	   file://no-python-check.patch;apply=yes"
+           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 8941c77..3a84256 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;apply=yes"
+           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 207af5f..ac2f1e0 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;apply=yes "
+	   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 fa37a36..6d73c38 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;apply=yes \
-	   file://01-anonymous-support-and-misc-fixes.patch;apply=yes \
-	   file://02-namespaces.patch;apply=yes \
-	   file://04_saxlike_entity_parsing.patch;apply=yes \
-	   file://05-syncml-fixes.patch;apply=yes \
-	   file://06-no-install-docs.patch;apply=yes \
-	   file://07-current_attr_null.patch;apply=yes \
-	   file://08-maxsize-translation-table.patch;apply=yes;striplevel=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 ff6bbaa..f25a550 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;apply=yes"
+SRC_URI += "file://openttd_${PV}-buildfix.patch"
 
 
 
diff --git a/recipes/openvz/vzctl_3.0.23.bb b/recipes/openvz/vzctl_3.0.23.bb
index 6413ee8..51c1e4d 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;apply=yes \
+           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 b56b7d8..bccb114 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;apply=yes "
+	   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 b56b7d8..bccb114 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;apply=yes "
+	   file://dirdefines.patch "
diff --git a/recipes/opie-alarm/opie-alarm_cvs.bb b/recipes/opie-alarm/opie-alarm_cvs.bb
index 6d42b08..3b00444 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;apply=yes "
+	   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 8cef0d4..0258dd2 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;apply=yes \
+	   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 1f06489..873fc20 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;apply=yes "
+	   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 1f06489..873fc20 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;apply=yes "
+	   file://fix-rpath.patch "
diff --git a/recipes/opie-dvorak/opie-dvorak_cvs.bb b/recipes/opie-dvorak/opie-dvorak_cvs.bb
index 6d33b5a..f89e6f2 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;apply=yes "
+	   file://fix-rpath.patch "
diff --git a/recipes/opie-keyboard/opie-keyboard_1.2.3.bb b/recipes/opie-keyboard/opie-keyboard_1.2.3.bb
index 87d42fb..04caf8a 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;apply=yes "
+	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 87d42fb..04caf8a 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;apply=yes "
+	file://fix-rpath.patch "
diff --git a/recipes/opie-keyboard/opie-keyboard_cvs.bb b/recipes/opie-keyboard/opie-keyboard_cvs.bb
index 2842b49..213844e 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;apply=yes "
+	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 bc044ab..71f2309 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;apply=yes"
+           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 5726af5..de7b041 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;apply=yes"
+           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 6ffcc24..c7f0b24 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;apply=yes"
+           file://fix-rpath.patch"
 
-#           file://friendly-button-names.patch;apply=yes"
+#           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 6ffcc24..c7f0b24 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;apply=yes"
+           file://fix-rpath.patch"
 
-#           file://friendly-button-names.patch;apply=yes"
+#           file://friendly-button-names.patch"
diff --git a/recipes/opie-multikey/opie-multikey_cvs.bb b/recipes/opie-multikey/opie-multikey_cvs.bb
index d6390a8..180d8bb 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;apply=yes"
+           file://fix-rpath.patch"
 
-#           file://friendly-button-names.patch;apply=yes"
+#           file://friendly-button-names.patch"
diff --git a/recipes/opie-networksettings/opie-networksettings.inc b/recipes/opie-networksettings/opie-networksettings.inc
index aceca2e..e8bfa8e 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;apply=yes"
+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 c7afdb5..b01c905 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;apply=yes \
-           file://opkg.patch;apply=yes \
-           file://opkg_update.patch;apply=yes"
+           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 882eaf3..ccf3092 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;apply=yes"
+           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 882eaf3..ccf3092 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;apply=yes"
+           file://unbreak-logging.patch"
diff --git a/recipes/opie-qcop/opie-qcop_cvs.bb b/recipes/opie-qcop/opie-qcop_cvs.bb
index 4742bd1..16b051d 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;apply=yes"
+           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 d6b5a14..f0d3fb5 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;apply=yes"
+           file://crash_fix.patch"
diff --git a/recipes/opie-reader/uqtreader_cvs.bb b/recipes/opie-reader/uqtreader_cvs.bb
index e1b7274..19a3d9a 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;apply=yes"
+	   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 d876d81..245d044 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;apply=yes \
-           file://opie-sh-fsmounter-name.patch;apply=yes"
+           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 d876d81..245d044 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;apply=yes \
-           file://opie-sh-fsmounter-name.patch;apply=yes"
+           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 daa8544..fe12b77 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;apply=yes "
+           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 d60a72e..6e4a2a5 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;apply=yes"
+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 04f713c..ab547b0 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;apply=yes;striplevel=3 \
-           file://server-pro-old.patch;apply=yes \
+	   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 e422aee..8dfb6a0 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;apply=yes;striplevel=3 \
-           file://no-builtin-qss-startup.patch;apply=yes \
-           file://kbdlocks-runtime.patch;apply=yes \
-	   file://restart-from-bindir.patch;apply=yes \
-           file://server-pro-old.patch;apply=yes \
-	   file://firstuse-path.patch;apply=yes \
+           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 8c093d6..bd0c3fa 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;apply=yes;striplevel=3 \
-           file://no-builtin-qss-startup.patch;apply=yes \
-           file://kbdlocks-runtime.patch;apply=yes \
-	   file://restart-from-bindir.patch;apply=yes \
-           file://server-pro-1.2.4.patch;apply=yes \
-	   file://firstuse-path.patch;apply=yes \
-           file://force-firstuse-calibrate.patch;apply=yes \
+           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 641e0b5..c4a289c 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;apply=yes;striplevel=3 \
-           file://no-builtin-qss-startup.patch;apply=yes \
-           file://kbdlocks-runtime.patch;apply=yes \
-	   file://restart-from-bindir.patch;apply=yes \
-           file://server-pro-cvs.patch;apply=yes \
-	   file://firstuse-path.patch;apply=yes \
+           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 ec9372e..884aa83 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;apply=yes \
-	   file://gcc-syntax-fix.patch;apply=yes"
+           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 ab8e950..a6b503e 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;apply=yes"
+           file://unbreak-logging.patch"
diff --git a/recipes/opie-todo/opie-todo_cvs.bb b/recipes/opie-todo/opie-todo_cvs.bb
index 3ccb821..4b41bdf 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;apply=yes"
+           file://unbreak-logging.patch"
diff --git a/recipes/opkg/opkg-native_svn.bb b/recipes/opkg/opkg-native_svn.bb
index 9ba8e45..fe3ed4e 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;apply=yes;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 f3efcc8..4d49dff 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;apply=yes \
-	    file://opkg_wget.patch;apply=yes;maxrev=180 \
-	    file://reduce-nogpg-noise.patch;apply=yes;maxrev=180 \
-	    file://opkg_wget_nogpg_01_use_vfork_gunzip.patch;apply=yes \
-	    file://opkg_wget_nogpg_02_use_vfork_system.patch;apply=yes \
-	    file://opkg_wget_nogpg_03_fix_tmpdirs.patch;apply=yes \
-	    file://opkg_wget_nogpg_04_default_tmpdir.patch;apply=yes \
+	    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 bfa1427..1149b72 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;apply=yes;maxrev=201 \
-	file://opkg-intercept-cleanup.patch;apply=yes;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 6a62bf8..19b5514 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;apply=yes \
-           file://oparchive_fix.patch;apply=yes \
-           file://root_option.patch;apply=yes \
-           file://opstart.patch;apply=yes \
-           file://fix-arith.patch;apply=yes;striplevel=0 \
-           file://gcc43x-fix.patch;apply=yes \
-           file://armv7a.diff;apply=yes"
+           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 b2bc27f..221fac4 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;apply=yes \
-	file://0.9.4-armv7a.diff;apply=yes \
+	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 ed6aab0..2578330 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;apply=yes"
+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 fb39fce..ba4fb35 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;apply=yes \
+           file://opstart.patch \
 	   file://acinclude.m4"
 
 S = "${WORKDIR}/oprofile"
diff --git a/recipes/orc/orc_0.4.3.bb b/recipes/orc/orc_0.4.3.bb
index 3c343c9..a80c59e 100644
--- a/recipes/orc/orc_0.4.3.bb
+++ b/recipes/orc/orc_0.4.3.bb
@@ -5,7 +5,7 @@ PR = "r2"
 SRC_URI[orc.md5sum] = "9b2e7030c8df8a0d371115869fe5685a"
 SRC_URI[orc.sha256sum] = "4c0266d81da67fef0b2abd5e624a9ab0db5de04eb23c3ab24e22f5f9ceeefbfe"
 
-SRC_URI += "file://03_orcutils.patch;apply=yes \
-	file://99_autoreconf.patch;apply=yes"
+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
index 53aad7b..29bf11b 100644
--- a/recipes/orc/orc_0.4.4.bb
+++ b/recipes/orc/orc_0.4.4.bb
@@ -5,4 +5,4 @@ PR = "r0"
 SRC_URI[orc.md5sum] = "35f3b7283f391ab8ade7f94332940414"
 SRC_URI[orc.sha256sum] = "62f8808d61a275861c8e0429c76932ef923f0ca50db8dc3e73b0745a631e386f"
 
-SRC_URI += "file://044_orcutils.patch;apply=yes "
+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 10158a4..7eee686 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;apply=yes \
-           file://monitor-${PV}.patch;apply=yes \
+           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 7073672..6188ee6 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;apply=yes \
-           file://list-move.patch;apply=yes \
-           file://add_event.patch;apply=yes \
-           file://add_utsname.patch;apply=yes \
-           file://spectrum_cs_ids.patch;apply=yes"
+           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 a1978bc..1af5dca 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;apply=yes \
-           file://list-move.patch;apply=yes \
-           file://add_utsname.patch;apply=yes \
-           file://add_event.patch;apply=yes \
-           file://spectrum_cs_ids.patch;apply=yes \
-           file://catch-up-with-kernel-changes.patch;apply=yes"
+           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 6870ce6..2939b5d 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;apply=yes"
+           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 d36d530..69a416c 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;apply=yes"
+	   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 bae2b98..6c05146 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;apply=yes \
-	file://otpcalc-0.97-badindex.diff;apply=yes \
-	file://otpcalc-crypto-proto.diff;apply=yes \
-	file://otpcalc-0.97-gtk2-gentoo.patch;apply=yes \
+	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/p3scan/p3scan_2.9.05d.bb b/recipes/p3scan/p3scan_2.9.05d.bb
index 42c809f..689330d 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;apply=yes \
-           file://dont-search-use-include.patch;apply=yes \
-           file://configure.in-add-newline.patch;apply=yes \
+           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/pacemaker_1.0.8.bb b/recipes/pacemaker/pacemaker_1.0.8.bb
index a032350..fb8c9dd 100644
--- a/recipes/pacemaker/pacemaker_1.0.8.bb
+++ b/recipes/pacemaker/pacemaker_1.0.8.bb
@@ -20,12 +20,12 @@ 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;apply=yes \
-	file://pacemaker-dont-use-help2man.patch;apply=yes \
-	file://fix-header-defs-lookup.patch;apply=yes \
+	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;apply=yes"
+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
diff --git a/recipes/packagekit/packagekit_0.2.4.bb b/recipes/packagekit/packagekit_0.2.4.bb
index 1b7f780..be9d4dc 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;apply=yes \
-           file://repository-ping.patch;apply=yes \
-           file://force_depends.patch;apply=yes \
-           file://racing_condition.patch;apply=yes \
+           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 92f68cb..306ff4b 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;apply=yes \
-           file://opkg-fix-includes.diff;apply=yes \
-           file://opkg-fix-declarations.diff;apply=yes "
+           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 90d043d..6fc50c2 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;apply=yes \
+           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 d5f4aab..3822edf 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;apply=yes \
-           file://opkgfixes.patch;apply=yes"
+           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 ce9f5b0..8cef0bc 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;apply=yes"
+SRC_URI += " file://libpam-config.patch"
 # The Makefile uses 'FAKEROOT' not DESTDIR.
-SRC_URI += " file://libpam-make.patch;apply=yes"
+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 bc65664..08cb78f 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;apply=yes "
+           file://pam-nodocs.patch "
 
-SRC_URI_append_linux-uclibc = " file://pam-disable-nis-on-uclibc.patch;apply=yes"
-SRC_URI_append_linux-uclibceabi = " file://pam-disable-nis-on-uclibc.patch;apply=yes"
+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 ea1549c..3e88376 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;apply=yes \
-           file://fix_disabled_nls.patch;apply=yes \
+           file://pam-nodocs.patch \
+           file://fix_disabled_nls.patch \
           "
 
-UCLIBC_PATCHES = " file://pam-disable-nis-on-uclibc.patch;apply=yes \
-                   file://disable_modules_uclibc.patch;apply=yes \
+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 fb97ccb..0a01814 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;apply=yes \
+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 a396f3b..34ca0ec 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;apply=yes"
+	   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 db5591e..2eea178 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;apply=yes"
+	   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 84d5dd2..be9e81d 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;apply=yes \
+	   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 6fa60bc..0d0f025 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;apply=yes"
+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 5ba3822..84af64f 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;apply=yes"
+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 6998f45..51da5b1 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;apply=yes"
+	   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 aa70bae..43778e4 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;apply=yes \
-	   file://pkgconfig_fixes.patch;apply=yes"
+	   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 c475e4a..c915f4c 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;apply=yes \
-	   file://parted-1.8.x.patch;apply=yes \
+	   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 9271e50..0ca5c8b 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;apply=yes \
-	   file://debian.patch;apply=yes \
-	   file://install.patch;apply=yes \
-           file://unified-reject-files.diff;apply=yes \
-           file://global-reject-file.diff;apply=yes "
+	   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 9cb099c..5fc00f1 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;apply=yes "
+SRC_URI_append_build-freebsd = " file://freebsd_gpatch.patch "
 S = "${WORKDIR}/patcher"
 
 PATCHTOOL = "patch"
diff --git a/recipes/pciutils/pciutils_2.1.11.bb b/recipes/pciutils/pciutils_2.1.11.bb
index a49ae5c..1b8c770 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;apply=yes \
-	   file://configure-uclibc.patch;apply=yes \
-	   file://pcimodules-pciutils-2.1.11.diff;apply=yes"
+	   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 0a86e4a..d9fa88d 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;apply=yes \
-	   file://configure-uclibc.patch;apply=yes \
-	   file://pcimodules-pciutils.diff;apply=yes"
+	   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 e23a804..7994265 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;apply=yes "
-SRC_URI_append_nylon = "file://gcc-3-compatibility.patch;apply=yes "
+	   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 f1bf561..8c723e8 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;apply=yes \
-           file://auto_mount.patch;apply=yes \
+           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;apply=yes"
+	   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 fa7ff91..155a217 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;apply=yes \
-	   file://network.patch;apply=yes \
-	   file://pcic-extra.patch;apply=yes \
-	   file://automount.patch;apply=yes \
-	   file://ratoc-cfu1u.patch;apply=yes \
-	   file://no-hostap-cards.patch;apply=yes \
-	   file://gcc4_fixes.patch;apply=yes \
+	   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;apply=yes"
-SRC_URI_append_sh3 = " file://superh-noO3.patch;apply=yes"
+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 c6a03de..101d997 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;apply=yes \
-            file://version_workaround.patch;apply=yes \
-	    file://modalias_update.patch;apply=yes"
+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 f1e7120..c44116a 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;apply=yes \
-            file://version_workaround.patch;apply=yes \
-	    file://modalias_update.patch;apply=yes"
+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 dec6a51..1e21f00 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;apply=yes \
-            file://version_workaround.patch;apply=yes \
-	    file://ccdv.patch;apply=yes \
+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 81d43ae..75f6d74 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;apply=yes \
+	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 934a3ef..ae9a83c 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;apply=yes \
+	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 1e7c39b..6391728 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;apply=yes \
+	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 74112f2..e0da338 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;apply=yes \
+	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 64b33b6..f298ac8 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;apply=yes \
+        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 69ebb66..8bafff0 100644
--- a/recipes/perl/perl-native_5.10.1.bb
+++ b/recipes/perl/perl-native_5.10.1.bb
@@ -12,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;apply=yes \
-           file://perl-configpm-switch.patch;apply=yes \
-           file://native-nopacklist.patch;apply=yes \
-           file://native-perlinc.patch;apply=yes \
+           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"
diff --git a/recipes/perl/perl-native_5.8.8.bb b/recipes/perl/perl-native_5.8.8.bb
index b4354ba..336b419 100644
--- a/recipes/perl/perl-native_5.8.8.bb
+++ b/recipes/perl/perl-native_5.8.8.bb
@@ -9,14 +9,14 @@ 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;apply=yes \
-           file://Configure-multilib.patch;apply=yes \
-           file://perl-configpm-switch.patch;apply=yes \
-           file://native-nopacklist.patch;apply=yes \
-           file://native-no-gdbminc.patch;apply=yes \
-           file://native-perlinc.patch;apply=yes \
-           file://makedepend-dash.patch;apply=yes \
-           file://asm-pageh-fix.patch;apply=yes"
+           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}"
 
diff --git a/recipes/perl/perl_5.10.1.bb b/recipes/perl/perl_5.10.1.bb
index 816ed07..75ae81d 100644
--- a/recipes/perl/perl_5.10.1.bb
+++ b/recipes/perl/perl_5.10.1.bb
@@ -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;apply=yes \
-        file://Makefile.patch;apply=yes \
-        file://Makefile.SH.patch;apply=yes \
-        file://installperl.patch;apply=yes \
-        file://perl-dynloader.patch;apply=yes \
-        file://perl-moreconfig.patch;apply=yes \
-        file://letgcc-find-errno.patch;apply=yes \
-        file://generate-sh.patch;apply=yes \
-        file://shared-ldflags.patch;apply=yes \
-	file://cross-generate_uudmap.patch;apply=yes \
+	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 \
diff --git a/recipes/perl/perl_5.8.8.bb b/recipes/perl/perl_5.8.8.bb
index c2c6adb..4f4c468 100644
--- a/recipes/perl/perl_5.8.8.bb
+++ b/recipes/perl/perl_5.8.8.bb
@@ -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;apply=yes \
-        file://Makefile.SH.patch;apply=yes \
-        file://makedepend-dash.patch;apply=yes \
-        file://installperl.patch;apply=yes \
-        file://perl-dynloader.patch;apply=yes \
-        file://perl-moreconfig.patch;apply=yes \
-        file://letgcc-find-errno.patch;apply=yes \
-        file://generate-sh.patch;apply=yes \
-        file://perl-5.8.8-gcc-4.2.patch;apply=yes \
-        file://09_fix_installperl.patch;apply=yes \
-        file://52_debian_extutils_hacks.patch;apply=yes \
-        file://53_debian_mod_paths.patch;apply=yes \
-        file://54_debian_perldoc-r.patch;apply=yes \
-        file://58_debian_cpan_config_path.patch;apply=yes \
-        file://60_debian_libnet_config_path.patch;apply=yes \
-        file://62_debian_cpan_definstalldirs.patch;apply=yes \
-        file://64_debian_enc2xs_inc.patch;apply=yes \
-        file://asm-pageh-fix.patch;apply=yes \
-        file://shared-ldflags.patch;apply=yes \
+        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 \
diff --git a/recipes/petitepainture/petitepainture_1.5.bb b/recipes/petitepainture/petitepainture_1.5.bb
index c0acf8b..6e84968 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;apply=yes \
+           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 a732558..4a25363 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;apply=yes \
+           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 dd5b921..34adeae 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;apply=yes;striplevel=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 f2ce8d5..b77eb82 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;apply=yes;striplevel=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 a4cc662..ca00e30 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;apply=yes;striplevel=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 4ea0b6d..d5ed932 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;apply=yes"
+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 9446b82..bfee93c 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;apply=yes \
-               file://php-m4-divert.patch;apply=yes"
+               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 1a85f46..2a31299 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;apply=yes \
-            file://imap-fix-autofoo.patch;apply=yes \
-            file://CVE-2010-0397.patch;apply=yes \
+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 b57c391..3b011ab 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;apply=yes \
-	file://string.c.patch;apply=yes "
+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 0c18ae6..dfb828b 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;apply=yes \
-           file://configlocation.patch;apply=yes \
+           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 e10e186..7e2e4ed 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;apply=yes \
-           file://gcc4.patch;apply=yes"
+           file://nolock.patch \
+           file://gcc4.patch"
 
 CFLAGS_append = ' -DVERSION_STR=\\"${PV}\\"'
 
diff --git a/recipes/pidgin/pidgin_2.5.8.bb b/recipes/pidgin/pidgin_2.5.8.bb
index 160f096..7f22cd6 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;apply=yes \
-  file://pidgin.desktop-set-icon.patch;apply=yes \
-  file://purple-OE-branding-25.patch;apply=yes \
-  file://pidgin-cross-python.patch;apply=yes \
+  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 acf3133..0fe0e51 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;apply=yes \
-  file://pidgin.desktop-set-icon.patch;apply=yes \
-  file://purple-OE-branding-25.patch;apply=yes \
-  file://pidgin-cross-python-265.patch;apply=yes \
+  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 6d8bb7e..102dfe0 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;apply=yes \
-  file://pidgin.desktop-set-icon.patch;apply=yes \
-  file://purple-OE-branding-25.patch;apply=yes \
-  file://pidgin-cross-python-265.patch;apply=yes \
+  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 1d7bcda..1dfed1f 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;apply=yes \
-	   file://contacts-util-fixup.diff;apply=yes \
+	   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 8e88744..daf1014 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;apply=yes \
+	   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 71f7e5b..29bf77d 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;apply=yes \
+	   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 7472b9a..71ebe4d 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;apply=yes \
+	   file://dates-owl-window-menu.patch \
 	  "
diff --git a/recipes/pimlico/tasks_0.13.bb b/recipes/pimlico/tasks_0.13.bb
index 4506e00..e3736a6 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;apply=yes;striplevel=0 file://libtool.diff;patch=1;pnum=0"
+        file://tasks-owl.diff;striplevel=0 file://libtool.diff;patch=1;pnum=0"
 
 SRC_URI[md5sum] = "536ffbbd0f38489c8e3ea9eaf0f67d59"
 SRC_URI[sha256sum] = "3a1029eb587a0587cf3ebcb8c256062ca595b4f5d0a30188fa4aae3adb49ca5a"
diff --git a/recipes/pimlico/tasks_svn.bb b/recipes/pimlico/tasks_svn.bb
index 6511793..7f528fc 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;apply=yes"
+        file://tasks-owl.diff"
diff --git a/recipes/pingus/pingus_0.7.2.bb b/recipes/pingus/pingus_0.7.2.bb
index 52b7749..94bc84f 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;apply=yes \
-  file://boost.patch;apply=yes \
-  file://cheader.patch;apply=yes \
+  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 86bf3aa..cdadcf0 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;apply=yes"
+           file://fix-datadir.patch"
 S = "${WORKDIR}/pipepanic-0.1.1-source"
 
 APPIMAGE = "zaurus/pipepanic.png"
diff --git a/recipes/pkgconfig/pkgconfig.inc b/recipes/pkgconfig/pkgconfig.inc
index 4155b45..acbda40 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;apply=yes \
-           file://sysrootfix.patch;apply=yes \
+           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 35ff574..a7a1031 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;apply=yes \
-	file://configure.patch;apply=yes"
+	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 13bf2be..5348575 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;apply=yes \
-	   file://install.patch;apply=yes \
+	   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 e8d016e..9d1ca57 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;apply=yes \
-	   file://install.patch;apply=yes \
+	   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 ee420a6..f6088da 100644
--- a/recipes/pmount/pmount_0.9.19.bb
+++ b/recipes/pmount/pmount_0.9.19.bb
@@ -8,8 +8,8 @@ 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;apply=yes \
-	   file://install.patch;apply=yes \
+	   file://gettext.patch \
+	   file://install.patch \
 	  "
 
 inherit autotools gettext
diff --git a/recipes/pmount/pmount_0.9.4.bb b/recipes/pmount/pmount_0.9.4.bb
index 3abc900..8dccc3f 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;apply=yes \
-	 file://no-hal.patch;apply=yes"
+	 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 fe40477..ab732e4 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;apply=yes \
-           file://remove-local-includes.patch;apply=yes \
-           file://unicode.patch;apply=yes \
+           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 98cf892..f107e4d 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;apply=yes \
-           file://qpobox.patch;apply=yes"
+           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 3c00587..8c0ebec 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;apply=yes \
-           file://cellardb.patch;apply=yes \
-           file://pocketcellar.patch;apply=yes \
-           file://gcc3.patch;apply=yes"
+           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 f25e589..f5b0508 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;apply=yes"
+           file://busybox_df.patch"
 
 S = "${WORKDIR}/podget"
 
diff --git a/recipes/poppler/poppler_0.5.9.bb b/recipes/poppler/poppler_0.5.9.bb
index 76527ab..aefbbfb 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;apply=yes"
+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 46d599a..aab8094 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;apply=yes \
-  file://intl.patch;apply=yes \
-  file://mkinstalldirs.patch;apply=yes \
+  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 7438a33..e833e18 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;apply=yes \
+           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 62a594b..f193871 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;apply=yes"
+	   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 252e7af..6c08432 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;apply=yes 		\
-	   file://fileselector.patch;apply=yes    \
-           file://qtversion.patch;apply=yes \
-           file://qt2310-fontbug.patch;apply=yes"
+	   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 a84aabb..5f2c47c 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;apply=yes;name=patch \
-	file://no-libwrap.patch;apply=yes;striplevel=0 \
+	${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;name=patch \
+	file://no-libwrap.patch;striplevel=0 \
 	file://portmap.init \
-	file://make.patch;apply=yes"
+	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 f528783..85cf705 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;apply=yes \
-	   file://no-tcpd-support.patch;apply=yes \
-           file://no-libwrap.patch;apply=yes;striplevel=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 e9ed066..153e651 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;apply=yes \
-	   file://install.patch;apply=yes \
+	   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 03f40c1..b1a90e7 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;apply=yes"
+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 dde495c..f5eb8d1 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;apply=yes \
-	   file://gcc43.diff;apply=yes \
-           file://boost.patch;apply=yes \
+           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 4fc074a..33a6e17 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;apply=yes"
+	   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 08a72aa..579ed90 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;apply=yes \
+	   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 fc73b26..a852a34 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;apply=yes"
+		   file://fix-makefile.patch"
 
 do_install() {
 	install -d ${D}${sbindir}
diff --git a/recipes/powertop/powertop.inc b/recipes/powertop/powertop.inc
index 0d68970..a113b93 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;apply=yes \
+	   file://ldflags.patch \
 	  "
 
 CFLAGS = "${LDFLAGS}"
diff --git a/recipes/powertop/powertop_1.11.bb b/recipes/powertop/powertop_1.11.bb
index 541592e..e383cc1 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;apply=yes;striplevel=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 88a59e9..a29767b 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;apply=yes"
+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 4a5de96..6323a79 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;apply=yes;striplevel=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 a9a8eee..66e78de 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;apply=yes \
+           file://bc-cat-0.2.0.patch \
            file://bc-cube.desktop \
 "
 
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 fd41300..6f6e073 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
@@ -15,7 +15,7 @@ IMGPV = "1.4.14.2514"
 BINFILE := "OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin"
 
 SRC_URI = "http://install.source.dir.local/OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin \
-           file://0001-Compile-fixes-for-recent-kernels.patch;apply=yes \
+           file://0001-Compile-fixes-for-recent-kernels.patch \
 "
 S = "${WORKDIR}/OMAP35x_Graphics_SDK_${SGXPV}/GFX_Linux_KM"
 
diff --git a/recipes/ppp/ppp_2.4.1.bb b/recipes/ppp/ppp_2.4.1.bb
index 0b7365c..6816328 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;apply=yes \
-	file://man.patch;apply=yes \
+	file://pppd.patch \
+	file://man.patch \
 	file://cifdefroute.dif;apply=yes \
-	file://pppd-resolv-varrun.patch;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;apply=yes"
+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 b3068cd..20ab3f8 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;apply=yes \
-	file://makefile.patch;apply=yes \
-	file://cifdefroute.patch;apply=yes \
-	file://pppd-resolv-varrun.patch;apply=yes \
-	file://plugins-fix-CC.patch;apply=yes \
-	file://pppoatm-makefile.patch;apply=yes \
-	file://enable-ipv6.patch;apply=yes \
-	file://makefile-remove-hard-usr-reference.patch;apply=yes \
-	file://ldflags.patch;apply=yes \
+        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;apply=yes"
+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 c2737a6..73bbe9c 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;apply=yes \
-	file://makefile.patch;apply=yes \
-	file://cifdefroute.patch;apply=yes \
-	file://pppd-resolv-varrun.patch;apply=yes \
-	file://plugins-fix-CC.patch;apply=yes \
-	file://pppoatm-makefile.patch;apply=yes \
-	file://enable-ipv6.patch;apply=yes \
-	file://makefile-remove-hard-usr-reference.patch;apply=yes \
-	file://ldflags.patch;apply=yes \
+        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;apply=yes"
+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 b4676fb..b2931c2 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;apply=yes \
+	   file://makefile.patch \
 	   file://options.pptp"
 
 
diff --git a/recipes/prelink/prelink_20061027.bb b/recipes/prelink/prelink_20061027.bb
index f992ff7..ad2faf5 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;apply=yes"
+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 f72473b..faf930c 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;apply=yes"
+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 41af3aa..4c83402 100644
--- a/recipes/prelink/prelink_20090925.bb
+++ b/recipes/prelink/prelink_20090925.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;apply=yes"
+#SRC_URI_append_linux-gnueabi = " file://arm_eabi.patch"
 
 S = "${WORKDIR}/prelink-0.0.${PV}"
 
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 c2d4d20..dd36ce7 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;apply=yes \
-      ${@['', 'file://wireless.patch;apply=yes'][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;apply=yes;striplevel=0 \
-           file://libgps-check.patch;apply=yes"
+           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 b58dccd..531efcc 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;apply=yes \
-	file://crosscompile.patch;apply=yes \
-        file://libz.patch;apply=yes;striplevel=0 \
-	file://wireless.patch;apply=yes"
+	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 0652604..863debf 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;apply=yes"
+           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 2d620e2..a2653b1 100644
--- a/recipes/procps/procps_3.2.8.bb
+++ b/recipes/procps/procps_3.2.8.bb
@@ -2,9 +2,9 @@ require procps.inc
 
 PR = "${INC_PR}.1"
 
-SRC_URI += "file://procmodule.patch;apply=yes \
-            file://psmodule.patch;apply=yes \
-	    file://linux-limits.patch;apply=yes \
+SRC_URI += "file://procmodule.patch \
+            file://psmodule.patch \
+	    file://linux-limits.patch \
 	    file://60_linux_version_init.dpatch;apply=yes \
 	    "
 
diff --git a/recipes/proftpd/proftpd_1.3.2e.bb b/recipes/proftpd/proftpd_1.3.2e.bb
index eca0bee..204a23f 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;apply=yes \
+	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 bc44512..afe6596 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;apply=yes"
+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 f2fc09f..8a87565 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;apply=yes"
+           file://paths.patch"
 
 inherit module
 
diff --git a/recipes/proxy-libintl/proxy-libintl_20080418.bb b/recipes/proxy-libintl/proxy-libintl_20080418.bb
index f421fa0..0802365 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;apply=yes \
-    file://create-as-shared-lib.patch;apply=yes \
-    file://soname.patch;apply=yes \
+    file://stub-only.patch \
+    file://create-as-shared-lib.patch \
+    file://soname.patch \
 "
 
 S = "${WORKDIR}"
diff --git a/recipes/psmisc/psmisc.inc b/recipes/psmisc/psmisc.inc
index 80cb31c..a8b7bb1 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;apply=yes"
+	   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 4e8d0d0..9c72ed8 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;apply=yes"
+	   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 b71f999..981f872 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;apply=yes"
+SRC_URI += "file://signames-header-fix.patch"
 
 SRC_URI[md5sum] = "d6276e071c10ddf4b0d98856e5573e1a"
 SRC_URI[sha256sum] = "495463860415171d9019798ed4fdf5848ffe93f8a380662a39dd2690a04717ed"
diff --git a/recipes/psplash/psplash-angstrom_svn.bb b/recipes/psplash/psplash-angstrom_svn.bb
index 2f1a0a4..2667cc4 100644
--- a/recipes/psplash/psplash-angstrom_svn.bb
+++ b/recipes/psplash/psplash-angstrom_svn.bb
@@ -10,8 +10,8 @@ ALTERNATIVE_PRIORITY = "20"
 # 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;apply=yes \
-          file://logo-math.patch;apply=yes \
+          file://psplash-18bpp.patch \
+          file://logo-math.patch \
           file://psplash-poky-img.h \
           file://psplash-bar-img.h \
           file://psplash-default \
diff --git a/recipes/psplash/psplash-omap3pandora_svn.bb b/recipes/psplash/psplash-omap3pandora_svn.bb
index 805be19..120679b 100644
--- a/recipes/psplash/psplash-omap3pandora_svn.bb
+++ b/recipes/psplash/psplash-omap3pandora_svn.bb
@@ -11,7 +11,7 @@ ALTERNATIVE_PRIORITY_omap3pandora = "5"
 # 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;apply=yes \
+          file://logo-math.patch \
           file://psplash-poky-img.h \
           file://psplash-bar-img.h \
           file://psplash-default \
diff --git a/recipes/psplash/psplash-openmoko_svn.bb b/recipes/psplash/psplash-openmoko_svn.bb
index 9d6b973..9c675b4 100644
--- a/recipes/psplash/psplash-openmoko_svn.bb
+++ b/recipes/psplash/psplash-openmoko_svn.bb
@@ -10,11 +10,11 @@ ALTERNATIVE_PRIORITY = "30"
 # 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;apply=yes \
+          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;apply=yes "
+SRC_URI_append_openmoko = " file://configurability.patch "
diff --git a/recipes/psplash/psplash_svn.bb b/recipes/psplash/psplash_svn.bb
index fc7174e..c47ff11 100644
--- a/recipes/psplash/psplash_svn.bb
+++ b/recipes/psplash/psplash_svn.bb
@@ -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;apply=yes "
-SRC_URI_append_openmoko = " file://configurability.patch;apply=yes "
-SRC_URI_append_boc01 = " file://psplash_grayscale.patch;apply=yes "
+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 46a9846..d27c909 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;apply=yes \
-	   file://ldflags.patch;apply=yes \
+	   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 c9c338a..b08299c 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;apply=yes \
+           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 dbbc660..a0e2d8f 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;apply=yes \
-           file://gentoo/libatomic_ops-1.2-mips.patch;apply=yes \
-	   file://dont.install.header.twice.patch;apply=yes"
+           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 3405573..58f2b1c 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;apply=yes"
+           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 b1bb9b8..0e6f06a 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;apply=yes"
+           file://libcanberra-increase-buffer-size.patch"
 
 EXTRA_OECONF = "\
   --enable-alsa \
diff --git a/recipes/pulseaudio/pulseaudio.inc b/recipes/pulseaudio/pulseaudio.inc
index ab3d05a..4504656 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;apply=yes \
-           file://configure-ac.patch;apply=yes \
+           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 4650a02..458766e 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;apply=yes \
-  file://libpulsedsp-references-libpulsecore.patch;apply=yes \
-  file://pa-drop-caps-returns-void.patch;apply=yes \
-#  file://libtool2.patch;apply=yes \
-  file://2113.diff;apply=yes;striplevel=0 \
-  file://2114.diff;apply=yes;striplevel=0 \
-  file://libiconv.patch;apply=yes \
+  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 d903ca9..4f12b7b 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;apply=yes \
-  file://buildfix.patch;apply=yes \
-#  file://libpulsedsp-references-libpulsecore.patch;apply=yes \
-#  file://pa-drop-caps-returns-void.patch;apply=yes \
-#  file://libtool2.patch;apply=yes \
-  file://2113.diff;apply=yes;striplevel=0 \
-  file://2114.diff;apply=yes;striplevel=0 \
-#  file://libiconv.patch;apply=yes \
+  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 e96a2b6..e95b7d4 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;apply=yes \
-  file://alsaerror.patch;apply=yes \
-  file://periodfix.patch;apply=yes \
-  file://fallback.patch;apply=yes \
-  file://autoconf_version.patch;apply=yes \
-  file://gettext.patch;apply=yes \
-  file://fixbluezbuild.patch;apply=yes \
-  file://tls_m4.patch;apply=yes \
-  file://sbc-thumb.patch;apply=yes \
-  file://CVE-2009-1299.patch;apply=yes \
-  file://CVE-2009-1894.patch;apply=yes \
+  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 c6ddc4c..a0ba1a0 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;apply=yes \
-  file://autoconf_version.patch;apply=yes \
-  file://tls_m4.patch;apply=yes \
-  file://configure_silent_rules.patch;apply=yes \
-  file://gettext.patch;apply=yes \
-  file://fixbluezbuild.patch;apply=yes \
+  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 5fa6abb..8be0ea2 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;apply=yes \
-  file://autoconf_version.patch;apply=yes \
-  file://tls_m4.patch;apply=yes \
-  file://configure_silent_rules.patch;apply=yes \
+  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 00481b1..9babcae 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;apply=yes \
-  file://fix-dbus-without-hal.patch;apply=yes \
-  file://fix-shm.patch;apply=yes \
+  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 c51f6c3..7bff529 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;apply=yes"
+           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 5fd30aa..63ca033 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;apply=yes"
+	   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 4ec6e3e..a2fb02e 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;apply=yes"
+           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 4cd6298..ffc1c8f 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;apply=yes"
+           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 eafefea..92ff4c1 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;apply=yes"
+           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 3981514..c5cca8d 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;apply=yes"
+           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 da9491f..84407e0 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;apply=yes \
+	   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 3dee63f..3619891 100644
--- a/recipes/pxaregs/pxaregs_1.14.bb
+++ b/recipes/pxaregs/pxaregs_1.14.bb
@@ -4,10 +4,10 @@ AUTHOR = "Holger Schurig <hs4233 at 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;apply=yes \
-           file://munmap.patch;apply=yes \
-           file://serial.patch;apply=yes \
-           file://usb.patch;apply=yes "
+           file://i2c.patch \
+           file://munmap.patch \
+           file://serial.patch \
+           file://usb.patch "
 
 S = "${WORKDIR}"
 
diff --git a/recipes/pythm/pythm_svn.bb b/recipes/pythm/pythm_svn.bb
index 8fd3d89..e66cf27 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;apply=yes \
+           file://mplayer-escape-filenames.patch \
            file://pythm.desktop \
 	   file://pythm.conf"
 S = "${WORKDIR}/pythm"
diff --git a/recipes/python/python-edje_svn.bb b/recipes/python/python-edje_svn.bb
index 0e29de1..793db0c 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;apply=yes"
+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 d060b92..d56c201 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;apply=yes \
-  file://import-gobject-instead-of-pygtk.patch;apply=yes \
+  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 6aa13f2..622da92 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;apply=yes \
-  file://import-gobject-instead-of-pygtk.patch;apply=yes \
+  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 4929c77..cf8f348 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;apply=yes"
+           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 ea1fd7a..f7f3cbe 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;apply=yes"  
+           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 30717ab..84e870d 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;apply=yes \
+  file://install.patch \
 "
 S = "${WORKDIR}/m2crypto-0.18.2"
 
diff --git a/recipes/python/python-mysqldb_1.2.1.bb b/recipes/python/python-mysqldb_1.2.1.bb
index 1722d18..ca5e217 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;apply=yes \
-  file://site.patch;apply=yes \
+  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 12c622b..44da281 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;apply=yes \
-  file://04-default-is-optimized.patch;apply=yes \
-  file://05-enable-ctypes-cross-build.patch;apply=yes \
-  file://10-distutils-fix-swig-parameter.patch;apply=yes \
-  file://11-distutils-never-modify-shebang-line.patch;apply=yes \
-  file://12-distutils-prefix-is-inside-staging-area.patch;apply=yes \
-  file://debug.patch;apply=yes \
-  file://nohostlibs.patch;apply=yes \
+  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 9c8ce54..4205312 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;apply=yes \
-  file://04-default-is-optimized.patch;apply=yes \
-  file://05-enable-ctypes-cross-build.patch;apply=yes \
-  file://06-ctypes-libffi-fix-configure.patch;apply=yes \
-  file://10-distutils-fix-swig-parameter.patch;apply=yes \
-  file://11-distutils-never-modify-shebang-line.patch;apply=yes \
-  file://12-distutils-prefix-is-inside-staging-area.patch;apply=yes \
-  file://debug.patch;apply=yes \
-  file://nohostlibs.patch;apply=yes \
+  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 86c0f14..a49e0e1 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;apply=yes"
+           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 97a8812..f5c23e0 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;apply=yes \
-	   file://trycompile.diff;apply=yes \
+           file://unbreak-assumptions.diff \
+	   file://trycompile.diff \
 	   file://config.h \
 	   file://numpyconfig.h \
 	  "
diff --git a/recipes/python/python-pycairo_1.4.0.bb b/recipes/python/python-pycairo_1.4.0.bb
index be2a7cd..94bb338 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;apply=yes"
+           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 cbdade8..6437c37 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;apply=yes"
+           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 6ebd632..fa26042 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;apply=yes"
+           file://no-docs.patch"
 S = "${WORKDIR}/${SRCNAME}"
 
 inherit distutils
diff --git a/recipes/python/python-pycurl_7.18.2.bb b/recipes/python/python-pycurl_7.18.2.bb
index c319e6d..c66e94c 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;apply=yes \
+  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 73da6da..3551b32 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;apply=yes \
+  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 eb58153..2853a55 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;apply=yes \
+  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 5f38091..27d5adb 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;apply=yes \
+#  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 6e422b5..02ff86e 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;apply=yes \
+#  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 d049037..155c5d9 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;apply=yes \
-  file://generate-constants.patch;apply=yes \
+  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 4febf4c..fc920c7 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;apply=yes \
+  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 139e0b0..f8d4bf0 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;apply=yes \
+  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 b588450..f8dcdd0 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;apply=yes \
+           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 e37646d..daf854c 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;apply=yes \
-           file://prevent_to_get_display_during_import.patch;apply=yes \
-           file://nodocs.patch;apply=yes \
-           file://gdk_display.patch;apply=yes;striplevel=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 5522c1a..eaea9af 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;apply=yes \
+           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 19d9bf8..3a3e7bb 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;apply=yes \
+  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 05e8a05..a0dac36 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;apply=yes"
+           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 702acd7..3b00de8 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;apply=yes"
+           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 d297076..a0003aa 100644
--- a/recipes/python/python-pyqt_4.4.3.bb
+++ b/recipes/python/python-pyqt_4.4.3.bb
@@ -13,11 +13,11 @@ 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;apply=yes \
+  file://cross-compile.patch \
   file://01_configure.dpatch;apply=yes \
   file://02_htmllinks.dpatch;apply=yes \
   \
-  file://assistantclient-fix.patch;apply=yes \
+  file://assistantclient-fix.patch \
 "
 S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
 
diff --git a/recipes/python/python-pyrex_0.9.8.5.bb b/recipes/python/python-pyrex_0.9.8.5.bb
index 2d98c90..c354b11 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;apply=yes \
+  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 41d2c1a..a36fe9b 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;apply=yes;striplevel=0 \
+  file://pyro-unattended-install.patch;striplevel=0 \
 "
 S = "${WORKDIR}/Pyro-${PV}"
 
diff --git a/recipes/python/python-pysqlite2_2.4.0.bb b/recipes/python/python-pysqlite2_2.4.0.bb
index 562479b..3ed8940 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;apply=yes"
+           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 c704205..df24384 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;apply=yes \
+  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 36677f6..93e9fd1 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;apply=yes \
+           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 e8c5baa..83ee814 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;apply=yes \
+#  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 e678bb7..d8f2458 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;apply=yes"
+           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 0d3ecf7..5ff8d4a 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;apply=yes"
+           file://disable-oggcheck.patch"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/recipes/python/python_2.6.1.bb b/recipes/python/python_2.6.1.bb
index d7995ca..fea6008 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;apply=yes \
-  file://01-use-proper-tools-for-cross-build.patch;apply=yes \
-  file://02-remove-test-for-cross.patch;apply=yes \
-  file://03-fix-tkinter-detection.patch;apply=yes \
-  file://04-default-is-optimized.patch;apply=yes \
-  file://05-enable-ctypes-cross-build.patch;apply=yes \
-  file://06-libffi-enable-default-mips.patch;apply=yes \
-  file://07-export-grammer.patch;apply=yes \
-  file://99-ignore-optimization-flag.patch;apply=yes \
+  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;apply=yes \
-#  file://06-fix-urllib-exception.patch;apply=yes \
-#  file://16-bug1179-imageop.patch;apply=yes \
-#  file://13-set-wakeup-fix.patch;apply=yes \
+#  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 275ecbc..8a14db5 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;apply=yes \
-  file://01-use-proper-tools-for-cross-build.patch;apply=yes \
-  file://02-remove-test-for-cross.patch;apply=yes \
-  file://03-fix-tkinter-detection.patch;apply=yes \
-  file://04-default-is-optimized.patch;apply=yes \
-  file://05-enable-ctypes-cross-build.patch;apply=yes \
-  file://99-ignore-optimization-flag.patch;apply=yes \
+  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;apply=yes \
-#  file://06-fix-urllib-exception.patch;apply=yes \
-#  file://16-bug1179-imageop.patch;apply=yes \
-#  file://13-set-wakeup-fix.patch;apply=yes \
+#  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 efd90bd..84234f7 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;apply=yes \
-  file://01-use-proper-tools-for-cross-build.patch;apply=yes \
-  file://02-remove-test-for-cross.patch;apply=yes \
-  file://03-fix-tkinter-detection.patch;apply=yes \
-  file://04-default-is-optimized.patch;apply=yes \
-  file://05-enable-ctypes-cross-build.patch;apply=yes \
-  file://06-ctypes-libffi-fix-configure.patch;apply=yes \
-  file://99-ignore-optimization-flag.patch;apply=yes \
+  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;apply=yes \
-#  file://06-fix-urllib-exception.patch;apply=yes \
-#  file://16-bug1179-imageop.patch;apply=yes \
-#  file://13-set-wakeup-fix.patch;apply=yes \
+#  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/qemu/qemu_0.12.3.bb b/recipes/qemu/qemu_0.12.3.bb
index 08d7865..db9155c 100644
--- a/recipes/qemu/qemu_0.12.3.bb
+++ b/recipes/qemu/qemu_0.12.3.bb
@@ -5,22 +5,22 @@ PR = "r3"
 
 SRC_URI = "\
     http://download.savannah.gnu.org/releases/qemu/qemu-${PV}.tar.gz;name=qemu-${PV} \
-    file://06_exit_segfault.patch;apply=yes;striplevel=0 \
-    file://11_signal_sigaction.patch;apply=yes;striplevel=0 \
-    file://22_net_tuntap_stall.patch;apply=yes \
-    file://31_syscalls.patch;apply=yes;striplevel=0 \
-    file://32_syscall_sysctl.patch;apply=yes;striplevel=0 \
-    file://52_ne2000_return.patch;apply=yes \
-    file://63_sparc_build.patch;apply=yes;striplevel=0 \
-    file://64_ppc_asm_constraints.patch;apply=yes \
-    file://66_tls_ld.patch;apply=yes;striplevel=0 \
-    file://91-oh-sdl-cursor.patch;apply=yes;striplevel=0 \
-    file://fix_segfault.patch;apply=yes \
-    file://fix_baum_c_compilation.patch;apply=yes \
-    file://fix_fortify_source_compilation.patch;apply=yes \
-    file://3f26c1227e3b08010f2a65379cecf4cb4b5933fa.patch;apply=yes \
-    file://c5883be23519921254c6940873ee8db04979c20a.patch;apply=yes \
-    file://fallback.to.safe.mmap_min_addr.patch;apply=yes \
+    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
index 596a273..6bc5868 100644
--- a/recipes/qemu/qemu_0.12.4.bb
+++ b/recipes/qemu/qemu_0.12.4.bb
@@ -5,18 +5,18 @@ PR = "r1"
 
 SRC_URI = "\
     http://download.savannah.gnu.org/releases/qemu/qemu-${PV}.tar.gz;name=qemu-${PV} \
-    file://02_kfreebsd.patch;apply=yes \
-    file://03_support_pselect_in_linux_user_arm.patch;apply=yes \
-    file://05_bochs_vbe.diff;apply=yes \
-    file://06_sh4.diff;apply=yes \
-    file://leftover.patch;apply=yes \
-    file://3f26c1227e3b08010f2a65379cecf4cb4b5933fa.patch;apply=yes \
-    file://c5883be23519921254c6940873ee8db04979c20a.patch;apply=yes \
-    file://91-oh-sdl-cursor.patch;apply=yes \
-    file://fix_baum_c_compilation.patch;apply=yes \
-    file://fix_fortify_source_compilation.patch;apply=yes \
-    file://fallback.to.safe.mmap_min_addr.patch;apply=yes \
-    file://linux-user-fix-running-programs-with-iwmmxt.patch;apply=yes \
+    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"
diff --git a/recipes/qi/qi-ubi_git.bb b/recipes/qi/qi-ubi_git.bb
index 9395f40..08bc7c5 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;apply=yes \
+  file://rootfstype.ubifs.patch \
 "
diff --git a/recipes/qi/qi_git.bb b/recipes/qi/qi_git.bb
index 5d974f6..6a19292 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;apply=yes \
+  file://sanitize-makefile.patch \
 "
 S = "${WORKDIR}/git"
 
diff --git a/recipes/qiv/qiv_1.9.bb b/recipes/qiv/qiv_1.9.bb
index 15e72f9..a1b63c6 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;apply=yes \
+		file://makefile.patch \
 		"
 inherit pkgconfig binconfig
 
diff --git a/recipes/qmake/qmake2.inc b/recipes/qmake/qmake2.inc
index 91c969a..0e0f9cd 100644
--- a/recipes/qmake/qmake2.inc
+++ b/recipes/qmake/qmake2.inc
@@ -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;apply=yes \
-           file://qt-config.patch;apply=yes \
-           file://use-lflags-last.patch;apply=yes \
+           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 2533a96..d07f68b 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;apply=yes"
+SRC_URI += "file://qmake-hack.diff"
 
 do_install() {
     install -d ${D}/${bindir}
diff --git a/recipes/qof/qof_0.6.0.bb b/recipes/qof/qof_0.6.0.bb
index f03353b..3f96b66 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;apply=yes \
-           file://fix-includes.patch;apply=yes \
+           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 649636f..7232637 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;apply=yes \
-           file://fix-sigsegv.patch;apply=yes \
-           file://fix_qtversion_check.patch;apply=yes \
-           file://gcc4.patch;apply=yes"
+           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 6af751a..c26d710 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;apply=yes \
-	   file://buzzer-notification.patch;apply=yes \
-	   file://vit.patch;apply=yes"
+           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 8714cc9..872c729 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;apply=yes        \
-	   file://libgaim.patch;apply=yes "
+	   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 d72b3d1..9555fa7 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;apply=yes \
-           file://aliens.patch;apply=yes"
+	   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 c9e68d9..b753268 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;apply=yes"
+	   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 27c7aa5..5817f2b 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;apply=yes"
+           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 512ae0a..5b82438 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;apply=yes"
+	   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 3dfdef1..2959cb2 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;apply=yes \
-           file://fish.patch;apply=yes"
+           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 cca9ca6..4591007 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;apply=yes \
-	   file://glider.patch;apply=yes"
+           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 f07e007..6e5ff81 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;apply=yes \
-	   file://icebloxx.patch;apply=yes"
+           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 e24ab7c..c889cd3 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;apply=yes \
-	   file://mahjongg.patch;apply=yes"
+           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 9f43ee4..0c0f786 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;apply=yes"
+	   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 e09ae87..5ee0c32 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;apply=yes \
-	   file://nmm.patch;apply=yes"
+           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 22d15b4..d6b33fc 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;apply=yes"
+           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 f7a953c..cd77b37 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;apply=yes"
+           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 931396e..2c4d30d 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;apply=yes"
+           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 0daa84c..8823b5d 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;apply=yes"
+           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 eafcc65..0cd69bf 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;apply=yes"
+           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 05a9013..04b015f 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;apply=yes"
+           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 e1d57c3..87676ac 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;apply=yes"
+           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 002ae9c..8c66298 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;apply=yes"
+           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 091525f..b2b4429 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;apply=yes"
+           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 394e6fe..c79ec50 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;apply=yes "
+           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 90e2fbf..de38d97 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;apply=yes "
+	   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 8ead9ed..76b422c 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;apply=yes"
+	   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 398d8ba..199a5f7 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;apply=yes \
-           file://drawview.patch;apply=yes \
-           file://drawwidget.patch;apply=yes "
+           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 5ef6645..cfed35c 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;apply=yes;striplevel=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 8527d1d..def9563 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;apply=yes"
+        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 708e123..fd77159 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;apply=yes"
+	   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 d85b2eb..8a8d5d9 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;apply=yes \
-	   file://no-examples.patch;apply=yes \
-           file://gcc4_1-HACK.patch;apply=yes"
+	   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 f2704ee..1d4d5f9 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;apply=yes \
-	   file://no-examples.patch;apply=yes \
-           file://gcc4_1-HACK.patch;apply=yes"
+	   file://configure.patch \
+	   file://no-examples.patch \
+           file://gcc4_1-HACK.patch"
 
 require qt-x11-free-common.inc
 
diff --git a/recipes/qt4/qt-4.6.0.inc b/recipes/qt4/qt-4.6.0.inc
index 60c9ecd..d161416 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;apply=yes \
-           file://0002-fix-resinit-declaration.patch;apply=yes \
-           file://0004-no-qmake.patch;apply=yes \
-           file://0006-freetype-host-includes.patch;apply=yes \
-           file://0008-qt-lib-infix.patch;apply=yes \
-           file://0009-support-2bpp.patch;apply=yes \
-           file://0010-no-simpledecoration-example.patch;apply=yes \
-           file://fix-config-tests.patch;apply=yes \
+           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;apply=yes \
-           file://0917-Better-check-for-EGL-extension-strings.patch;apply=yes \
-           file://0919-Rebind-window-surface-fbo-after-native-GL-rendering.patch;apply=yes \
-           file://0943-Fixed-OpenGL-graphicssystem-issues-for-OpenGL-ES-2.0.patch;apply=yes \
-           file://0945-Add-EGL_BUFFER_SIZE-to-QEglProperties-reduceConfigur.patch;apply=yes \
-           file://0946-Fix-WA_TranslucentBackground-for-QGLWidgets-on-X11-E.patch;apply=yes \
-           file://0947-Compressed-texture-binding-for-QtOpenGL-ETC1-and-PVR.patch;apply=yes \
-           file://0951-Detect-GL2-paint-engine-based-on-fragment-shaders-no.patch;apply=yes \
-           file://0971-Fix-GL_BGRA-formats-under-OpenGL-ES-systems.patch;apply=yes \
-           file://0991-QGtkStyle-support-for-the-inner-border-property-in-G.patch;apply=yes \
-           file://0992-Make-sure-a-context-is-current-when-loading-compress.patch;apply=yes \
-           file://0993-Fix-upside-down-PVR-compressed-textures.patch;apply=yes \
-           file://0996-Export-QGLShareRegister-because-qgl_share_reg-is-exp.patch;apply=yes \
-           file://0998-Set-stacking-class-for-stays-on-top-windows-in-DFB.patch;apply=yes \
-           file://0999-Enable-customizing-of-DirectFB-layer-to-use.patch;apply=yes \
-           file://1008-GLES-2-should-not-use-a-multisampled-format-by-defau.patch;apply=yes \
-           file://1115-Fix-QGLWidgets-created-with-an-alpha-channel-on-X11-.patch;apply=yes \
-           file://1118-Fix-EGL-surface-leaks-when-re-parenting-QGLWidget-on.patch;apply=yes \
-           file://1136-Disable-depth-testing-during-the-2D-QGLWidget-render.patch;apply=yes \
-           file://1149-GL2Engine-Don-t-mark-brush-as-dirty-if-it-hasn-t-cha.patch;apply=yes \
-           file://1157-Align-GL_RGB-lines-on-a-4-byte-boundary-when-uploadi.patch;apply=yes \
-#           file://1165-NEON-configure-detection-and-initial-blend-function-.patch;apply=yes \
-           file://1175-Fix-memory-leak-of-QGLGlyphCoord-objects-in-the-Open.patch;apply=yes \
-           file://1197-Add-GLfloat-2-2-GLfloat-3-3-uniform-setters-to-QGLSh.patch;apply=yes \
-           file://1198-Handle-broken-shaders-better-in-the-GL2-engine-s-sha.patch;apply=yes \
-           file://1205-Fix-text-rendering-on-GL2-paint-engine.patch;apply=yes \
+           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;apply=yes"
+            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 3853583..e89cf17 100644
--- a/recipes/qt4/qt-4.6.2.inc
+++ b/recipes/qt4/qt-4.6.2.inc
@@ -3,15 +3,15 @@ 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;apply=yes \
-           file://0002-fix-resinit-declaration.patch;apply=yes \
-           file://0004-no-qmake.patch;apply=yes \
-           file://0006-freetype-host-includes.patch;apply=yes \
-           file://0008-qt-lib-infix.patch;apply=yes \
-           file://0009-support-2bpp.patch;apply=yes \
-           file://0010-no-simpledecoration-example.patch;apply=yes \
-           file://fix-config-tests.patch;apply=yes \
-           file://qt-config.patch;apply=yes \
+           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 \
            "
@@ -61,7 +61,7 @@ do_install_append() {
 
 LICENSE = "LGPLv2.1 GPLv3"
 SRC_URI += " \
-            file://hack-out-pg_config.patch;apply=yes"
+            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.bb b/recipes/qt4/qt4-embedded-gles_4.6.2.bb
index 6cd5b53..21c461a 100644
--- a/recipes/qt4/qt4-embedded-gles_4.6.2.bb
+++ b/recipes/qt4/qt4-embedded-gles_4.6.2.bb
@@ -6,7 +6,7 @@ QT_GLFLAGS = "-opengl es2 -depths 16,24,32  -plugin-gfx-powervr"
 
 require qt-${PV}.inc
 
-SRC_URI += "file://cursor-hack.diff;apply=yes"
+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 a3dd994..9aaca6e 100644
--- a/recipes/qt4/qt4-embedded.inc
+++ b/recipes/qt4/qt4-embedded.inc
@@ -12,15 +12,15 @@ 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;apply=yes \
-           file://0002-fix-resinit-declaration.patch;apply=yes \
-           file://0003-no-tools.patch;apply=yes \
-           file://0004-no-qmake.patch;apply=yes \
-           file://0006-freetype-host-includes.patch;apply=yes \
-           file://0007-openssl-host-includes.patch;apply=yes \
-           file://0008-qt-lib-infix.patch;apply=yes \
-           file://0009-support-2bpp.patch;apply=yes \
-           file://fix-config-tests.patch;apply=yes \
+           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 \
            "
diff --git a/recipes/qt4/qt4-embedded_4.5.2.bb b/recipes/qt4/qt4-embedded_4.5.2.bb
index 672992c..3e0c860 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;apply=yes \
-            file://hack-out-pg_config.patch;apply=yes"
+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 8cb5597..b6e3107 100644
--- a/recipes/qt4/qt4-tools-native.inc
+++ b/recipes/qt4/qt4-tools-native.inc
@@ -10,7 +10,7 @@ INC_PR = "r7"
 inherit native
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
-           file://qt-config.patch;apply=yes \
+           file://qt-config.patch \
            file://g++.conf \
            file://linux.conf"
 S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
diff --git a/recipes/qt4/qt4-tools-native_4.4.3.bb b/recipes/qt4/qt4-tools-native_4.4.3.bb
index ee899f7..c7915f3 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;apply=yes \
-           file://qt-config.patch;apply=yes \
+           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 0b68d14..206e486 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;apply=yes \
-           file://qt-config.patch;apply=yes \
+           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 861970f..0fd4890 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;apply=yes \
-           file://qt-config.patch;apply=yes \
+           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 dbb2b9d..240f053 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;apply=yes \
-           file://qt-config.patch;apply=yes \
+           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 987fbbc..faf0567 100644
--- a/recipes/qt4/qt4-tools-sdk_4.6.2.bb
+++ b/recipes/qt4/qt4-tools-sdk_4.6.2.bb
@@ -11,8 +11,8 @@ inherit sdk
 PR = "r1"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
-           file://configure-lflags.patch;apply=yes \
-           file://qt-config.patch;apply=yes \
+           file://configure-lflags.patch \
+           file://qt-config.patch \
            file://g++.conf \
            file://linux.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 2863920..3fe7218 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;apply=yes"
-SRC_URI += "file://hack-out-pg_config.patch;apply=yes"
+#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.inc b/recipes/qt4/qt4-x11-free.inc
index 3403565..fc96f03 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;apply=yes \
-           file://0002-fix-resinit-declaration.patch;apply=yes \
-           file://0003-no-tools.patch;apply=yes \
-           file://0004-no-qmake.patch;apply=yes \
-           file://0006-freetype-host-includes.patch;apply=yes \
-           file://0007-openssl-host-includes.patch;apply=yes \ 
-           file://0008-qt-lib-infix.patch;apply=yes \
-           file://fix-config-tests.patch;apply=yes \
+           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 2ee968a..b545dea 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;apply=yes"
+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 51616aa..2f56345 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;apply=yes \
-	   file://vt-switch.patch;apply=yes \
-	   file://daemonize.patch;apply=yes \
-	   file://no-moc.patch;apply=yes \
-	   file://gcc3.patch;apply=yes \
-	   file://gcc4.patch;apply=yes \
-	   file://encoding.patch;apply=yes \
-	   file://fix-qgfxraster.patch;apply=yes \
-	   file://qt-visibility.patch;apply=yes \
-	   file://tslib.patch;apply=yes \
-	   file://handhelds.patch;apply=yes \
-	   file://qiconview-speed.patch;apply=yes \
-	   file://qtabbar.patch;apply=yes \
-	   file://increase-qxml-robustness.patch;apply=yes \
-	   file://qte-fix-iconsize.patch;apply=yes \
-	   file://fix-linuxfb-setmode.patch;apply=yes \
-	   file://fix-linuxfb-offscreenoverflow.patch;apply=yes \
-	   file://fix-qscreen-sync.patch;apply=yes \
-	   file://improve-calibration-r0.patch;apply=yes \
-	   file://key.patch;apply=yes \
-	   file://bidimetrics.patch;apply=yes;striplevel=5 \
-	   file://fix-native-build.patch;apply=yes \
-	   file://fix-errno-exception-spec.patch;apply=yes \
-           file://keyboardless-buttonmap.patch;apply=yes \
-           file://kernel-keymap.patch;apply=yes \
-	   file://kernel-keymap-corgi.patch;apply=yes \
-	   file://remove-unused-kbdhandler.patch;apply=yes \
-	   file://disable-dup-rotation.patch;apply=yes \
-	   file://fix-qte-asm-include.patch;apply=yes \
+   	   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;striplevel=5 \
+	   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;apply=yes \
-                      file://c7x0-w100-gcc4.patch;apply=yes \
-		      file://suspend-resume-hooks.patch;apply=yes"
+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;apply=yes "
-#SRC_URI_append_akita        = "file://spitz-adhoc-keypad-rotate.patch;apply=yes "
+#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;apply=yes "
+#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 0663312..7d5189e 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;apply=yes \
-	   file://id-path.patch;apply=yes \
-	   file://scroll.patch;apply=yes \
-           file://keymap.patch;apply=yes \
-           file://dodnx.patch;apply=yes \
-           file://keychooser.patch;apply=yes \
-           file://sessionfiles.patch;apply=yes \
-           file://ssh_dnserror.patch;apply=yes \
+	   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 16745ca..4c95b74 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;apply=yes \
+           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 ea07ba4..0fc1101 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;apply=yes \
-           file://cl_parse.c.patch;apply=yes \
-           file://vid_sdl.c.patch;apply=yes \
-           file://host.c.patch;apply=yes"
+           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 abfb2f7..ff01b06 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;apply=yes"
+           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 16f0f0b..fe4d37e 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;apply=yes \
+           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 f621f0f..bfaf2e8 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;apply=yes \
+	   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 72717dc..dc40da4 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;apply=yes"
+	   file://cross-compile.patch"
 
 inherit qmake qt3x11
 
diff --git a/recipes/quilt/quilt-native.inc b/recipes/quilt/quilt-native.inc
index 5fb5171..5c5a015 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;apply=yes "
+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 764e36a..1721049 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;apply=yes"
+SRC_URI += "file://aclocal.patch"
 
 inherit autotools gettext
 
diff --git a/recipes/quilt/quilt.inc b/recipes/quilt/quilt.inc
index f266aa5..fd0d40d 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;apply=yes"
+           file://install.patch"
 
 S = "${WORKDIR}/quilt-${PV}"
diff --git a/recipes/qwo/qwo_0.4.bb b/recipes/qwo/qwo_0.4.bb
index 19d4131..d226e5a 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;apply=yes \
+	   file://check_lib.patch \
           "
 
 inherit autotools
diff --git a/recipes/qwo/qwo_0.5.bb b/recipes/qwo/qwo_0.5.bb
index 3f7095e..c0a5cd0 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;apply=yes"
+           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 5350622..59a3b29 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;apply=yes"
+          file://qt2-fix.patch"
 
 inherit palmtop
 
diff --git a/recipes/radlib/radlib-common.inc b/recipes/radlib/radlib-common.inc
index f93f938..cd6ef25 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;apply=yes"
+	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 04fd6c5..02b06c9 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;apply=yes "
+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 e479729..5d780f1 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;apply=yes \
+  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 537311a..7f093a6 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;apply=yes"
+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 116670a..6f3e677 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;apply=yes"
+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 8835a88..b9853d1 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;apply=yes"
-SRC_URI_append_ossystems = " file://rdesktop-addin.patch;apply=yes"
+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 057d861..15be6c8 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;apply=yes \
+	   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 9e31c1a..845a668 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;apply=yes \
-  file://configure_fix.patch;apply=yes \
+  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 9391dec..3ee7233 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;apply=yes"
+           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 fe25da1..cd24dab 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;apply=yes"
+           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 7226bef..3e7c6cd 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;apply=yes"
+	file://recode-bitfield-width.patch"
 
 inherit autotools
 
diff --git a/recipes/redfang/redfang.bb b/recipes/redfang/redfang.bb
index 8c9996a..65a0d5c 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;apply=yes;striplevel=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 b47868a..c58b546 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;apply=yes \
-	   file://sane_pkgconfig.patch;apply=yes"
+           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 b9ba634..5461172 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;apply=yes"
+           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 4911989..cd4ff41 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;apply=yes \
-		file://key_short.c.patch;apply=yes \
-		file://key_large.c.patch;apply=yes \
-		file://align.patch;apply=yes"
+		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 9de637b..ad43a41 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;apply=yes \
+	  file://header-fix.patch \
 	  "
 
 S = "${WORKDIR}/reiserfsprogs-${PV}"
diff --git a/recipes/roadmap/roadmap-gtk2_1.1.0.bb b/recipes/roadmap/roadmap-gtk2_1.1.0.bb
index e9f6d26..79d226b 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;apply=yes;striplevel=2 \
-           file://options.mk.patch;apply=yes;striplevel=2 \
-           file://roadmap_path.patch;apply=yes \
-           file://roadmap.desktop.patch;apply=yes \
+           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 e5b6fd2..70118e2 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;apply=yes;striplevel=2 \
-           file://options.mk.patch;apply=yes;striplevel=2 \
-           file://roadmap_path.patch;apply=yes \
+           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 9da0195..815a615 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;apply=yes;striplevel=2 \
-           file://options.mk.patch;apply=yes;striplevel=2 \
-           file://qt/qt2-fixes.patch;apply=yes \
-           file://qt/qt_canvas.patch;apply=yes \
-           file://qt/qt_main.patch;apply=yes \
-           file://qt/roadmap_main.patch;apply=yes \
-           file://roadmap_path.patch;apply=yes \
-           file://roadmap.desktop.patch;apply=yes \
+           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 675d0c2..d2219d2 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;apply=yes;striplevel=2 \
-           file://options.mk.patch;apply=yes;striplevel=2 \
-           file://qt/qt2-fixes.patch;apply=yes \
-           file://roadmap_path.patch;apply=yes \
+           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 d844653..368f5a1 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;apply=yes \
-   file://gummake.patch;apply=yes \
+   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 3d54ecf..9057e2c 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;apply=yes"
+	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 902998d..c082169 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;apply=yes;striplevel=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 1c20e68..6e46ee9 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;apply=yes;striplevel=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 a628f5e..927217b 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;apply=yes;striplevel=2 \
-	file://rp-pppoe-3.5_libevent_makefile_cross.diff;apply=yes;striplevel=2 \
-	file://rp-pppoe-3.5_no_strip.diff;apply=yes;striplevel=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 e311c4e..9a41236 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;apply=yes \
-           file://configure_in_cross.patch;apply=yes \
-           file://pppoe-src-restrictions.patch;apply=yes \
-           file://update-config.patch;apply=yes \
-           file://dont-swallow-errors.patch;apply=yes \
+           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 e37d82c..b96fde9 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;apply=yes \
-	   file://cross_libpaths.patch;apply=yes \
-	   file://rpmconfigdir.patch;apply=yes \
-	   file://weakdeps.patch;apply=yes;striplevel=0 \
-	   file://tagsbackport.patch;apply=yes;striplevel=0 \
-	   file://missingok.patch;apply=yes;striplevel=0 \
-	   file://extcond.patch;apply=yes;striplevel=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 6c2ea39..44a5545 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;apply=yes;striplevel=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 6b5a2bc..597a946 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;apply=yes \
+  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 d88ccf7..c2ee0d7 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;apply=yes \
+  file://m4.patch \
   file://rsyncd.conf \
 "
 # The source tarball from 3.0.6 seems to need this
diff --git a/recipes/rsyslog/rsyslog_5.4.0.bb b/recipes/rsyslog/rsyslog_5.4.0.bb
index cc5b96a..6a2699c 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;apply=yes"
+SRC_URI += " file://atomics.patch"
 
 SRC_URI[md5sum] = "291882229d50496f42bd63174076dd37"
 SRC_URI[sha256sum] = "d9cd21d2fcd45fcae65eb0a51927c40315cca02afdc62478abd950febfcf7228"
diff --git a/recipes/rt2x00/rt3070_2.1.1.0.bb b/recipes/rt2x00/rt3070_2.1.1.0.bb
index 385c34e..3fbed10 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;apply=yes \
-	   file://config.patch;apply=yes \
+           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 10acfe8..6ef6535 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;apply=yes \
-           file://openssl.patch;apply=yes \
-           file://disable_wide_getaddrinfo_check.patch;apply=yes"
+           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 6120e36..6de359d 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;apply=yes \
-           file://extmk.patch;apply=yes \
+           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 d684b43..d2e78b1 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;apply=yes \
+    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 d06a2b9..b246c56 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;apply=yes \
-	   file://signedchar.patch;apply=yes"
+	   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 d69c141..bad8222 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;apply=yes \
-	   file://signedchar.patch;apply=yes"
+	   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 3632b61..d125d37 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;apply=yes"
+	   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 e52ea22..7164e1c 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;apply=yes \
-	   file://signedchar.patch;apply=yes"
+	   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 fd51c8f..6c15eb1 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;apply=yes \
-	   file://signedchar.patch;apply=yes"
+	   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 5ee6d2f..5b9c3da 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;apply=yes \
-	   file://signedchar.patch;apply=yes"
+	   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 7907d71..e4879ae 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;apply=yes \
-           file://signedchar.patch;apply=yes"
+           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 0d90680..329c3f0 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;apply=yes \
-           file://signedchar.patch;apply=yes"
+           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 4c9175e..67ba216 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;apply=yes \
-	   file://signedchar.patch;apply=yes \
-	   file://makefile.patch;apply=yes"
+	   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 2b809d2..f4840b7 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;apply=yes"
+	   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 832dc88..0ed4392 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;apply=yes"
+	   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 0ae984c..61b08f4 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;apply=yes"
+           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 76ce3ba..f501981 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;apply=yes"
+           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 2c5ef7a..0b3e6dd 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;apply=yes"
+           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 14a6734..2f02e91 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;apply=yes"
+           file://disable-automake-checks.patch"
 
 inherit autotools
 
diff --git a/recipes/sablevm/sablevm_1.12.bb b/recipes/sablevm/sablevm_1.12.bb
index 2742591..7d1ad8c 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;apply=yes"
+           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 264ba07..17269f3 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;apply=yes \
-            file://quota.patch;apply=yes;striplevel=0 \
-            file://configure-3.2.8.patch;apply=yes \
-            file://config-h.patch;apply=yes \
-            file://mtab.patch;apply=yes \
+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 4230018..6407764 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;apply=yes \
-            file://quota.patch;apply=yes;striplevel=0 \
-            file://configure-3.3.0.patch;apply=yes \
-            file://config-h.patch;apply=yes \
-            file://mtab.patch;apply=yes \
+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 9dda9e8..362762a 100644
--- a/recipes/samba/samba-basic.inc
+++ b/recipes/samba/samba-basic.inc
@@ -1,5 +1,5 @@
-SRC_URI += "file://config-lfs.patch;apply=yes \
-            file://quota.patch;apply=yes;striplevel=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 d62f5d1..0067265 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;apply=yes \
-           file://cifs.patch;apply=yes"
+           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 b3bd21f..f3c2584 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;apply=yes \
+SRC_URI = "file://config-lfs.patch \
 	   file://init-essential \
-           file://quota.patch;apply=yes;striplevel=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 e890337..c99ba06 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;apply=yes \
-            file://cifs.patch;apply=yes"
+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 dc97866..54a6b0a 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;apply=yes \
+SRC_URI += "file://configure.patch \
             "
-SRC_URI_append_linux-uclibc        = "file://uclibc-strlcpy-strlcat.patch;apply=yes"
-SRC_URI_append_linux-uclibceabi = "file://uclibc-strlcpy-strlcat.patch;apply=yes"
+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 6df396a..d5ec4ff 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;apply=yes \
-            file://config-h.patch;apply=yes \
-            file://mtab.patch;apply=yes \
+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 2796152..cebcc17 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;apply=yes \
-            file://config-h.patch;apply=yes \
-            file://mtab.patch;apply=yes \
-            file://tdbheaderfix.patch;apply=yes "
+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 40828d6..00fef0f 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;apply=yes \
-            file://config-h.patch;apply=yes \
-            file://mtab.patch;apply=yes \
-            file://tdbheaderfix.patch;apply=yes "
+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 6a02807..da5ec73 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;apply=yes \
+	file://Makefile.in.patch \
 	file://saned.xinetd \
 	file://byteorder.m4 \
 	file://stdint.m4 \
-	file://sane-symbols.diff;apply=yes \
+	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 6471818..f32d302 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;apply=yes \
+	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 c67f458..e47c4cf 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;apply=yes \
+	   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 f6dbf48..027a6c8 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;apply=yes"
+	   file://m4.patch"
 PR = "r1"
 
 inherit autotools pkgconfig
diff --git a/recipes/schroedinger/schroedinger.inc b/recipes/schroedinger/schroedinger.inc
index fa37ba7..7819814 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;apply=yes"
+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 068c2bc..153a1aa 100644
--- a/recipes/scim/scim_1.4.9.bb
+++ b/recipes/scim/scim_1.4.9.bb
@@ -7,7 +7,7 @@ PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz \
            file://gcc-4.4-const-char.dpatch;apply=yes \
-           file://configure.patch;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 \
@@ -15,7 +15,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz \
            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;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 215dc27..69058d9 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;apply=yes \
-           file://configure.patch;apply=yes"
+           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 78780f9..a29ab81 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;apply=yes \
-           file://configure.patch;apply=yes \
-           file://sched.patch;apply=yes \
-           file://no-stropts.patch;apply=yes \
-           file://no-utempter.patch;apply=yes \
+           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 34fc200..4b85648 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 at debian.org>"
 PR = "r1"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/s/scsi-idle/scsi-idle_${PV}-5.tar.gz \
-	file://makefile.patch;apply=yes \
-	file://scsi-idle.init.patch;apply=yes"
+	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 147aab3..38944b2 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;apply=yes"
+	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 ab72a1d..baf21db 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;apply=yes \
-			file://tremor.patch;apply=yes \
-			file://mouse.patch;apply=yes "
+			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 e0b4bd0..3c76fea 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;apply=yes \
-             file://gcc-4.x.x-accept.patch;apply=yes \
-	     file://sh3-linux-new-arch.patch;apply=yes \
-	     file://tail-obselete-fix.patch;apply=yes \
-	     file://tremor.patch;apply=yes"
+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 17c526a..600e723 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;apply=yes"
+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 b28530a..4901de2 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;apply=yes \
-            file://scummvm-targetcheck.patch;apply=yes"
+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 6e74605..1c4a251 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;apply=yes \
+             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 8b2648a..69628d5 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;apply=yes"
+           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 2dbbc53..a9cd791 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;apply=yes \
-           file://use-native-tools.patch;apply=yes"
+           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 d563ed3..76fc1c8 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;apply=yes"
+           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 c4843a8..6613993 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;apply=yes;striplevel=0 \
+	   file://SDL_Pango-0.1.2-API-adds.patch;striplevel=0 \
 	  "
 
 inherit autotools
diff --git a/recipes/sdr/sdrshell_svn.bb b/recipes/sdr/sdrshell_svn.bb
index 36dc0de..e5ceb13 100644
--- a/recipes/sdr/sdrshell_svn.bb
+++ b/recipes/sdr/sdrshell_svn.bb
@@ -9,7 +9,7 @@ SRCREV = "57"
 PV = "${SRCREV}"
 
 SRC_URI = "svn://sdr-shell.googlecode.com/svn/branches;module=sdr-shell-v2;proto=http \
-           file://gcc-43-fix.patch;apply=yes;striplevel=0"
+           file://gcc-43-fix.patch;striplevel=0"
 S = "${WORKDIR}/sdr-shell-v2"
 
 PARALLEL_MAKE = ""
diff --git a/recipes/sed/sed_4.1.bb b/recipes/sed/sed_4.1.bb
index aaecc5e..cb3d83a 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;apply=yes"
+	   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 12f05ca..5605f4a 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;apply=yes"
+	file://fix-sercfg.patch"
 
 LDFLAGS_append = "-rdynamic"
 
diff --git a/recipes/setmixer/setmixer_27DEC94.bb b/recipes/setmixer/setmixer_27DEC94.bb
index 9bf12e5..06cb0d3 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;apply=yes"
-SRC_URI_append_mnci = " file://devfs.patch;apply=yes"
+	   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 b924e99..8d1c554 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;apply=yes \
+  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 7c183fa..d189233 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;apply=yes"
+	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 45c0c20..ea99f46 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;apply=yes"
+	   file://autohell.patch"
 
 inherit autotools
 
diff --git a/recipes/sgmlspl/sgmlspl-native_1.03ii.bb b/recipes/sgmlspl/sgmlspl-native_1.03ii.bb
index 01460ea..36bb366 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;apply=yes"
+          file://combined.patch"
 
 S = "${WORKDIR}/SGMLSpm"
 
diff --git a/recipes/shadow/shadow_4.1.4.2.bb b/recipes/shadow/shadow_4.1.4.2.bb
index 910610e..05b3279 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;apply=yes"
+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 e053ab6..c918289 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;apply=yes \
-		file://aticore-2.6.patch;apply=yes \
-		file://make381.patch;apply=yes"
+		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 f2b1a93..9e63725 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;apply=yes \
-	   file://qt2310.patch;apply=yes"
+	   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 9bf9fff..67a26d1 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;apply=yes \
-           file://path_fix.patch;apply=yes"
+           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 2ba08e4..def9603 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;apply=yes;striplevel=0"
-SRC_URI_append_nylon = " file://shorewall-conf-nylon.diff;apply=yes"
+	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/sidplayer/sidplayer_1.5.0.bb b/recipes/sidplayer/sidplayer_1.5.0.bb
index 9c641b7..d617ca8 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;apply=yes \
-           file://gcc3.patch;apply=yes \
-	   file://gcc34.patch;apply=yes"
+           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 50e37aa..513c9d4 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;apply=yes"
+	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 d475877..c1b73ca 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;apply=yes"
+        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 348fc05..d3b02b2 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;apply=yes"
+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 079c1bf..f632089 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;apply=yes"
+           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 902a91f..d09bb21 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;apply=yes \
-           file://event_base.patch;apply=yes"
+           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 04233e5..5fe3ce1 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;apply=yes;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 264713b..0cc1d6f 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;apply=yes \
-           file://Makefile.patch;apply=yes"
+           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 56a6402..08a6cd9 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;apply=yes \
-	   file://chkslang.patch;apply=yes"
+	   file://m4.patch \
+	   file://chkslang.patch"
 
 inherit autotools
 
diff --git a/recipes/slugtool/slugtool.bb b/recipes/slugtool/slugtool.bb
index b11a370..4011105 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;apply=yes"
+	   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 2fc7689..0fac631 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;apply=yes \
-	   file://compile.patch;apply=yes"
+	   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 f247238..1afde81 100644
--- a/recipes/snes232/snes232_cvs.bb
+++ b/recipes/snes232/snes232_cvs.bb
@@ -6,7 +6,7 @@ PACKAGE_STRIP = "no"
 RRECOMMENDS = "kernel-module-serport"
 
 SRC_URI = "${HANDHELDS_CVS};module=gpe/games/snes232 \
-	file://snes232-2.6.patch;apply=yes;striplevel=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 a05c9fc..19c28c1 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;apply=yes"
+	   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 e5e3798..df712f5 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;apply=yes \
-	   file://gcc-4.1.patch;apply=yes"
+	   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 4a66ded..1b9091c 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;apply=yes;striplevel=2 \
-	file://private.patch;apply=yes;striplevel=0 \
-	file://64bit.patch;apply=yes \
-        file://configure.patch;apply=yes;striplevel=0 \
-        file://linkage.patch;apply=yes;striplevel=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/socat/socat_1.7.1.2.bb b/recipes/socat/socat_1.7.1.2.bb
index d04d5f9..e3accb6 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;apply=yes"
+           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 1aa2221..e04c3c2 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;apply=yes;striplevel=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 99c4493..2ac22f2 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;apply=yes"
+	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 43827d3..39e0417 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;apply=yes"
+         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 30522e2..77ec567 100644
--- a/recipes/spamassassin/spamassassin_3.3.1.bb
+++ b/recipes/spamassassin/spamassassin_3.3.1.bb
@@ -92,7 +92,7 @@ SRC_URI = " \
 	file://60_fix-pod;apply=yes \
 	file://70_fix-whatis;apply=yes \
 	file://80_fix_man_warnings;apply=yes \
-	file://spamassassin-spamc-configure.patch;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 710d18b..4485e62 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;apply=yes \
-	   file://vars.patch;apply=yes"
+	   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 9adca3a..550e0fc 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;apply=yes"
+           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 5286c04..41280cc 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;apply=yes \
-           file://configure_fix.patch;apply=yes \
-	   file://configSpeechd.conf.in_00.patch;apply=yes"
+           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 63a4d36..0821c5b 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;apply=yes"
+           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 7011f58..0ac120e 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;apply=yes"
+           file://cross-compile.patch"
 
 inherit autotools
 
diff --git a/recipes/sqlite/sqlite3.inc b/recipes/sqlite/sqlite3.inc
index cf2c904..b13fb1c 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;apply=yes"
+	   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 690d447..e6c4fc5 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;apply=yes \
-       file://mainmk_no_tcl.patch;apply=yes \
+       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 b07cf3c..7883ca1 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;apply=yes"
+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 5d8bf4c..58527ca 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;apply=yes"
+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 df1cee6..d071739 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;apply=yes"
+           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 de3d06e..b59b93f 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;apply=yes \
-           file://runfix.patch;apply=yes \
-           file://makefile.patch;apply=yes"
+           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 3a90e61..49d084f 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;apply=yes \
+           file://fix_epoll_check.patch \
            file://squid.init \
 	   file://squid-volatiles \
 	   "
diff --git a/recipes/squidguard/squidguard_1.4.bb b/recipes/squidguard/squidguard_1.4.bb
index e331e18..8b624bb 100644
--- a/recipes/squidguard/squidguard_1.4.bb
+++ b/recipes/squidguard/squidguard_1.4.bb
@@ -8,11 +8,11 @@ PR = "r1"
 
 SRC_URI = " \
 	http://www.squidguard.org/Downloads/squidGuard-${PV}.tar.gz;name=tar \
-	file://squidguard-1.4-no_header_checks.patch;apply=yes \
-	file://squidguard-1.4-fix-parallel-build.patch;apply=yes \
-	file://squidguard-cross-ldap.patch;apply=yes \
-	file://squidguard-fix-CVE-2009-3700.patch;apply=yes \
-	file://squidguard-fix-CVE-2009-3826.patch;apply=yes \
+	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 8c205f0..f330eec 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;apply=yes \
-	file://httphost.patch;apply=yes \
-	file://ca_segfault.patch;apply=yes \
+	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 8555825..a8350a0 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;apply=yes \
-           file://configure.patch;apply=yes \
-           file://libs-lcrypto.patch;apply=yes \
-           file://dont-strip.patch;apply=yes \
+           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/startup-monitor/startup-monitor_0.18-2.bb b/recipes/startup-monitor/startup-monitor_0.18-2.bb
index e350a32..81bf9c4 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;apply=yes"
+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 cf710ce..2386b44 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;apply=yes \
-	   file://quota.patch;apply=yes"
+	   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 de24ea8..3832091 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;apply=yes \
-	   file://quota.patch;apply=yes \
-	   file://strace-fix-arm-bad-syscall.patch;apply=yes"
+	   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 0710b9b..8526c91 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;apply=yes \
-           file://arm-eabi.patch;apply=yes \
-           file://sh-arch-update.patch;apply=yes \
-           file://sh-syscall-update.patch;apply=yes \
-           file://strace-fix-arm-bad-syscall.patch;apply=yes \
-           file://strace-undef-syscall.patch;apply=yes \
-           file://strace-arm-no-cachectl.patch;apply=yes \
-           file://strace-dont-include-linux-dirent-h.patch;apply=yes \
-           file://mips-sigcontext.patch;apply=yes \
+           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;apply=yes \
-     file://strace-4.5.14-avr32-add-syscalls-up-to-sysvipc.patch;apply=yes \
+     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 6206045..ae12146 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;apply=yes \
+	   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;apply=yes \  
+           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 265f392..de025ea 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;apply=yes \  
+           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 edfe139..02fd67c 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;apply=yes \
-	   file://automake.patch;apply=yes \
+	   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 188bfb0..3ebed9b 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;apply=yes"
+	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 409fda4..addb43e 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;apply=yes \
-	   file://neon-detection.patch;apply=yes"
+           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 1277de5..c26a483 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;apply=yes"
+	   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 6038916..d0e56cf 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;apply=yes \
-           file://nostrip.patch;apply=yes \
-           file://autofoo.patch;apply=yes \
-           file://noexec-link.patch;apply=yes"
+           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 9e8a681..0bbe352 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;apply=yes"
+           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 bb7c6f5..123ceae 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;apply=yes"
+           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 f8b8f24..0f5a229 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;apply=yes"
+           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 a0bb219..aad255b 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;apply=yes \
+	   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 cd2521d..4d88eef 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;apply=yes;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 a59e6e7..0006a2b 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;apply=yes \
+#           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/svgalib_1.9.25.bb b/recipes/svgalib/svgalib_1.9.25.bb
index aee9273..ac552b2 100644
--- a/recipes/svgalib/svgalib_1.9.25.bb
+++ b/recipes/svgalib/svgalib_1.9.25.bb
@@ -21,9 +21,9 @@ PR = "r0"
 PARALLEL_MAKE = ""
 
 SRC_URI = "http://my.arava.co.il/~matan/svgalib/svgalib-${PV}.tar.gz;name=tarball \
-	file://makefiles-ldconfig.patch;apply=yes \
-	file://gtfcalc-round.patch;apply=yes \
-	file://svgalib-1.9.25-linux2.6.patch;apply=yes \
+	file://makefiles-ldconfig.patch \
+	file://gtfcalc-round.patch \
+	file://svgalib-1.9.25-linux2.6.patch \
 	"
 
 S = "${WORKDIR}/svgalib-${PV}"
diff --git a/recipes/swfdec/swfdec_0.4.0.bb b/recipes/swfdec/swfdec_0.4.0.bb
index 02bf862..570ac57 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;apply=yes"
+	   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 2660207..e94462f 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;apply=yes"
+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 f4e12e6..6a89263 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;apply=yes;name=patch \
-	file://desktop.patch;apply=yes \
-	file://claws-mail-g_strcmp0.patch;apply=yes \
-	file://duplicate-header.patch;apply=yes \
+	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 c258c16..d31e32f 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;apply=yes"
+           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 592ed80..28a088f 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;apply=yes \
-	file://sylpheed-2.2.2-src-Makefile-am.patch;apply=yes \
-	file://sylpheed-gnutls_2.2.4.patch;apply=yes"
+	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 9480719..58f0e26 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;apply=yes"
+           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 0d99ad0..482db58 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;apply=yes"
+SRC_URI += "file://get_mnt_path_check.patch"
 
 SRC_URI[md5sum] = "14e7dcd0436d2f49aa403f67e1ef7ddc"
 SRC_URI[sha256sum] = "e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a"
diff --git a/recipes/sysklogd/sysklogd.inc b/recipes/sysklogd/sysklogd.inc
index 139d0c0..f25af53 100644
--- a/recipes/sysklogd/sysklogd.inc
+++ b/recipes/sysklogd/sysklogd.inc
@@ -4,7 +4,7 @@ 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;apply=yes \
+	       file://nonrootinstall.patch \
            file://sysklogd"
 
 # syslog initscript is handled explicitly because order of
diff --git a/recipes/sysklogd/sysklogd_1.5.bb b/recipes/sysklogd/sysklogd_1.5.bb
index 97a5dc5..946cbd4 100644
--- a/recipes/sysklogd/sysklogd_1.5.bb
+++ b/recipes/sysklogd/sysklogd_1.5.bb
@@ -1,7 +1,7 @@
 require sysklogd.inc
 PR = "${INC_PR}.2"
 
-SRC_URI += "file://no-strip-install.patch;apply=yes"
+SRC_URI += "file://no-strip-install.patch"
 
 SRC_URI[md5sum] = "e053094e8103165f98ddafe828f6ae4b"
 SRC_URI[sha256sum] = "6169b8e91d29288e90404f01462b69e7f2afb1161aa419826fe4736c7f9eb773"
diff --git a/recipes/sysvinit/sysvinit_2.86.bb b/recipes/sysvinit/sysvinit_2.86.bb
index bd94138..40c642a 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;apply=yes \
+           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 771e36d..9239734 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;apply=yes \
-           file://install.patch;apply=yes \
-	   file://libtool.patch;apply=yes"
+           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 6a06ec6..c398dda 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;apply=yes"
+           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 f33e2ab..54bf126 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;apply=yes \
-	   file://gcc_visibility_feature.diff;apply=yes \
-	   file://link_interface_libraries_fix.diff;apply=yes \
+           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 77f37fb..01332e1 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;apply=yes"
+	   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 f888e20..d8ef7bc 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;apply=yes"
+	   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 da186e0..1775005 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;apply=yes"
+	   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 3a3d053..186c821 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;apply=yes"
+	   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 8eceba4..bd72a66 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;apply=yes \
-           file://m4.patch;apply=yes"
+           file://configure.patch \
+           file://m4.patch"
 
 SRC_URI[md5sum] = "71bfeab35c9935631fc133f9d272b041"
 SRC_URI[sha256sum] = "0ef70273b6a54357c7823ed1f11015523f5cc5fe16df097e0b5300ae725c44e1"
diff --git a/recipes/tcltk/tcl_8.4.19.bb b/recipes/tcltk/tcl_8.4.19.bb
index 7c6f95a..a4a92a1 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;apply=yes;striplevel=2 \
-#  file://fix-configure.patch;apply=yes;striplevel=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
index edd14bf..f5ad879 100644
--- a/recipes/tcltk/tcl_8.5.8.bb
+++ b/recipes/tcltk/tcl_8.5.8.bb
@@ -7,13 +7,13 @@ PR = "r5"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
-  file://confsearch.diff;apply=yes;striplevel=2 \
-  file://manpages.diff;apply=yes;striplevel=2 \
-  file://non-linux.diff;apply=yes;striplevel=2 \
-  file://rpath.diff;apply=yes;striplevel=2 \
-  file://tcllibrary.diff;apply=yes;striplevel=2 \
-  file://tclpackagepath.diff;apply=yes;striplevel=2 \
-  file://tclprivate.diff;apply=yes;striplevel=2 \
+  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"
diff --git a/recipes/tcltk/tk_8.4.19.bb b/recipes/tcltk/tk_8.4.19.bb
index 730080c..68a8925 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;apply=yes;striplevel=0 \
-  file://tk-add-soname.patch;apply=yes;striplevel=2 \
-#  file://fix-configure.patch;apply=yes;striplevel=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
index 502496d..7637b7b 100644
--- a/recipes/tcltk/tk_8.5.8.bb
+++ b/recipes/tcltk/tk_8.5.8.bb
@@ -8,13 +8,13 @@ PR = "r1"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \
-  file://confsearch.diff;apply=yes;striplevel=2 \
-  file://manpages.diff;apply=yes;striplevel=2 \
-  file://non-linux.diff;apply=yes;striplevel=2 \
-  file://rpath.diff;apply=yes;striplevel=2 \
-  file://tklibrary.diff;apply=yes;striplevel=2 \
-  file://tkprivate.diff;apply=yes;striplevel=2 \
-  file://fix-xft.diff;apply=yes \
+  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"
diff --git a/recipes/tcp-wrappers/tcp-wrappers_7.6.bb b/recipes/tcp-wrappers/tcp-wrappers_7.6.bb
index 6fea271..c640764 100644
--- a/recipes/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/recipes/tcp-wrappers/tcp-wrappers_7.6.bb
@@ -14,7 +14,7 @@ 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;apply=yes \
+           file://00_man_quoting.diff \
            file://01_man_portability;apply=yes \
            file://05_wildcard_matching;apply=yes \
            file://06_fix_gethostbyname;apply=yes \
@@ -29,7 +29,7 @@ SRC_URI = "ftp://ftp.porcupine.org/pub/security/tcp_wrappers_${PV}.tar.gz \
            file://have_strerror;apply=yes \
            file://man_fromhost;apply=yes \
            file://restore_sigalarm;apply=yes \
-           file://rfc931.diff;apply=yes \
+           file://rfc931.diff \
            file://safe_finger;apply=yes \
            file://sig_fix;apply=yes \
            file://siglongjmp;apply=yes \
diff --git a/recipes/tcpdump/tcpdump_3.9.7.bb b/recipes/tcpdump/tcpdump_3.9.7.bb
index 38581dc..a72ef76 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;apply=yes \
-	file://ipv6-cross.patch;apply=yes \
+	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 12b1373..fa83882 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;apply=yes \
-	file://no-ipv6-tcpdump4.patch;apply=yes \
-	file://0001-minimal-IEEE802.15.4-allowed.patch;apply=yes \
-	file://ipv6-cross.patch;apply=yes \
-	file://configure.patch;apply=yes \
+	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 e73c8d7..5466395 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;apply=yes"
+	   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 cfe8f1c..efcdb4b 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;apply=yes"
+	   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 7eb3b6c..593fcfd 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;apply=yes;striplevel=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 0cb96ad..7dcc29d 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;apply=yes"
+        file://no-gnome.diff"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/telepathy/empathy_0.5.bb b/recipes/telepathy/empathy_0.5.bb
index 6c5978c..bc47e09 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;apply=yes;striplevel=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 bcdee1b..0a83851 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;apply=yes"
+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 a5ef7c1..25567cf 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;apply=yes \
+           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 f73d1fc..5064dad 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;apply=yes"
+           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 5bb537e..1dac450 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;apply=yes \
+           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 1cacf9f..415ce61 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;apply=yes"
+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 b839726..adf4082 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;apply=yes;striplevel=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 a0cc73f..8e9011c 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;apply=yes \
+	   file://install.patch \
 	   file://acinclude.m4 \
 	   file://init \
-	   file://htpasswd_shared.diff;apply=yes"
+	   file://htpasswd_shared.diff"
 S = "${WORKDIR}/thttpd-${PV}"
 
 PARALLEL_MAKE = ""
diff --git a/recipes/ti/bitblit_svn.bb b/recipes/ti/bitblit_svn.bb
index 4832975..3d6d4f0 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;apply=yes \
+           file://recent-linux.diff \
 "
 
 # Again, no '.' in PWD allowed :(
diff --git a/recipes/ti/gstreamer-ti_svn.bb b/recipes/ti/gstreamer-ti_svn.bb
index 3b53643..0486b8f 100644
--- a/recipes/ti/gstreamer-ti_svn.bb
+++ b/recipes/ti/gstreamer-ti_svn.bb
@@ -34,25 +34,25 @@ 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;apply=yes \
-           file://gstreamer-ti-remove-mp3-decode-support-from-auddec1.patch;apply=yes \
+           file://gstreamer-ti-tracker-462.patch \
+           file://gstreamer-ti-remove-mp3-decode-support-from-auddec1.patch \
            file://${GST_TI_RC_SCRIPT} \
 "
 
 SRC_URI_append_omap3 = " \
-           file://gstreamer-ti-add-omapfb.patch;apply=yes \
+           file://gstreamer-ti-add-omapfb.patch \
 "
 
 SRC_URI_append_omapl137 = " \
-           file://gstreamer-ti-omapl137.patch;apply=yes \
+           file://gstreamer-ti-omapl137.patch \
 "
 
 SRC_URI_append_omapl138 = " \
-           file://gstreamer-ti-omapl138.patch;apply=yes \
+           file://gstreamer-ti-omapl138.patch \
 "
 
 SRC_URI_append_dm6467 = " \
-           file://gstreamer-ti-dm6467-usesinglecsserver.patch;apply=yes \
+           file://gstreamer-ti-dm6467-usesinglecsserver.patch \
 "
 
 DEPENDS = "ti-dmai gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly"
diff --git a/recipes/ti/ti-codecs-omapl137_1.00.00.bb b/recipes/ti/ti-codecs-omapl137_1.00.00.bb
index 5da694b..44fdeb1 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;apply=yes"
+           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 54ebfc3..3da65cb 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;apply=yes"
+           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-dm355mm-module_1.13.bb b/recipes/ti/ti-dm355mm-module_1.13.bb
index d8e6e36..49ffc17 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;apply=yes \
+		   file://dm355mm.patch \
 	      "
 S = "${WORKDIR}/dm355_codecs_${PV}"
 BINFILE="dm355_codecs_setuplinux_${PV}.bin"
diff --git a/recipes/ti/ti-dmai_svn.bb b/recipes/ti/ti-dmai_svn.bb
index 97e0220..91c1b4b 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;apply=yes "
+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_1.64.bb b/recipes/ti/ti-dsplink_1.64.bb
index fe43231..9a13f20 100644
--- a/recipes/ti/ti-dsplink_1.64.bb
+++ b/recipes/ti/ti-dsplink_1.64.bb
@@ -8,9 +8,9 @@ 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;apply=yes \
-                  file://dsplink_1_64_add_dm6446_build_support.patch;apply=yes \
-                  file://dsplink_1_64_add_omapl137_build_support.patch;apply=yes "
+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
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 7debc3a..8c96819 100644
--- a/recipes/ti/ti-local-power-manager_1.24.01.bb
+++ b/recipes/ti/ti-local-power-manager_1.24.01.bb
@@ -3,7 +3,7 @@ require ti-local-power-manager.inc
 PV = "1_24_01"
 PE = "1"
 
-SRC_URI_append = " file://lpm-1_24_01-replace-define-OPT.patch;apply=yes"
+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/tickypip/tickypip_0.1.2.bb b/recipes/tickypip/tickypip_0.1.2.bb
index 643be44..28c05c5 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;apply=yes \
+           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 f884328..6e0253f 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;apply=yes"
-#	   file://autofoo.patch;apply=yes \
-#	   file://compile.patch;apply=yes"
+	   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 dd8f3a9..e38d4bf 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;apply=yes"
+	   file://m4.patch"
 
 PARALLEL_MAKE = ""
 
diff --git a/recipes/tinc/tinc_1.0.2.bb b/recipes/tinc/tinc_1.0.2.bb
index d7a93a7..c1c57b1 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;apply=yes \
-	file://public-key-fix.diff;apply=yes \
+	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 a652647..40171ff 100644
--- a/recipes/tinylogin/tinylogin_1.4.bb
+++ b/recipes/tinylogin/tinylogin_1.4.bb
@@ -9,10 +9,10 @@ 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;apply=yes \
-	file://add-system.patch;apply=yes \
-	file://adduser-empty_pwd.patch;apply=yes \
-	file://remove-index.patch;apply=yes"
+	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 89f59a7..1eefc6e 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;apply=yes \
+	   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 85ce30f..5519345 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;apply=yes \
+	   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 4015460..c0097dd 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;apply=yes;maxdate=20061113 \
-	   file://no-iconv-detect.patch;apply=yes;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 ef9c53f..11665d7 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;apply=yes \
-	   file://busybox-init.d.patch;apply=yes \
-	   file://char-signed-idiocy.patch;apply=yes"
+	   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 8172073..4cab03d 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;apply=yes"
+	   file://compile.patch"
 
 inherit autotools
 
diff --git a/recipes/tofrodos/tofrodos_1.7.8.bb b/recipes/tofrodos/tofrodos_1.7.8.bb
index 22dd5c8..3047c45 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;apply=yes;striplevel=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 c40f690..1045c0b 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;apply=yes \
-          file://make.patch;apply=yes \
-          file://compat.patch;apply=yes \
+          file://configure.patch \
+          file://make.patch \
+          file://compat.patch \
           file://tor.init"
 
 
diff --git a/recipes/totem/totem_2.28.1.bb b/recipes/totem/totem_2.28.1.bb
index 819ee70..aa32900 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;apply=yes"
+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 ead1c88..98dafa7 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;apply=yes"
+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 bd9cd9b..bbd0871 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;apply=yes"
+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 88fb9d4..9ab3974 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;apply=yes \
+           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 456cd8a..20bd80c 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;apply=yes \
-           file://05-tracker-ioprio-cross.patch;apply=yes \
-           file://10-drop-bogus-version-info.patch;apply=yes \
-           file://20-tracker-defaults.patch;apply=yes \
-           file://30-gmime-2.4.patch;apply=yes \
-           file://99-autoreconf.patch;apply=yes \           
+           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 6bdced8..dd17bca 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;apply=yes;striplevel=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 758a186..f8ba1ff 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;apply=yes"
+           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 811ab4f..31232a7 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;apply=yes"
+	 file://fixes.patch"
 
 DEPENDS="gtk+ intltool-native"
 
diff --git a/recipes/tslib/tslib.inc b/recipes/tslib/tslib.inc
index bad2ec2..715b7e7 100644
--- a/recipes/tslib/tslib.inc
+++ b/recipes/tslib/tslib.inc
@@ -12,8 +12,8 @@ SRC_URI += "\
   file://tslib.sh \
 "
 SRC_URI_append_mnci += "\
-  file://devfs.patch;apply=yes \
-  file://event1.patch;apply=yes \
+  file://devfs.patch \
+  file://event1.patch \
 "
 
 inherit autotools pkgconfig
diff --git a/recipes/tslib/tslib_1.0.bb b/recipes/tslib/tslib_1.0.bb
index 3574e39..0a23bce 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;apply=yes \
-           file://tslib-nopressure.patch;apply=yes \
-           file://tslib-pluginsld.patch;apply=yes \
-           file://newer-libtool-fix.patch;apply=yes "
+           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 fffe94d..d577d39 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;apply=yes"
+	   file://Makefile.patch"
 
 ######################################################################################
 
diff --git a/recipes/twin/twin_0.4.6.bb b/recipes/twin/twin_0.4.6.bb
index 7f98d59..c6c3fbd 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;apply=yes"
+	   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 4e7dba6..ab2a59a 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;apply=yes \
-           file://gcc4.patch;apply=yes"
+           file://gcc3.patch \
+           file://gcc4.patch"
 
 inherit palmtop
 
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 b86282a..0256ef3 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;apply=yes \
-file://ext2load_hex.patch;apply=yes \
-file://uboot-s3c2410-warnings-fix.patch;apply=yes \
-file://uboot-strtoul.patch;apply=yes \
-file://uboot-cramfs_but_no_jffs2.patch;apply=yes \
-file://nand-read_write_oob.patch;apply=yes \
-file://uboot-arm920t-gd_in_irq.patch;apply=yes \
-file://uboot-arm920_s3c2410_irq_demux.patch;apply=yes \
-file://uboot-s3c2410-nand.patch;apply=yes \
-file://uboot-cmd_s3c2410.patch;apply=yes \
-file://uboot-s3c2410-mmc.patch;apply=yes \
-file://env_nand_oob.patch;apply=yes \
-file://dynenv-harden.patch;apply=yes \
-file://uboot-s3c2410_fb.patch;apply=yes \
-file://uboot-20061030-qt2410.patch;apply=yes \
-file://uboot-20061030-neo1973.patch;apply=yes \
-file://uboot-s3c2410-misccr-definitions.patch;apply=yes \
-file://boot-from-ram-reloc.patch;apply=yes \
-file://boot-from-ram-and-nand.patch;apply=yes \
-file://wakeup-reason-nand-only.patch;apply=yes \
-file://uboot-neo1973-resume.patch;apply=yes \
-file://nand-dynamic_partitions.patch;apply=yes \
-file://uboot-s3c2410-norelocate_irqvec_cpy.patch;apply=yes \
-file://uboot-usbtty-acm.patch;apply=yes \
-file://uboot-s3c2410_udc.patch;apply=yes \
-file://bbt-create-optional.patch;apply=yes \
-file://nand-createbbt.patch;apply=yes \
-file://dontask.patch;apply=yes \
-file://nand-badisbad.patch;apply=yes \
-file://uboot-bbt-quiet.patch;apply=yes \
-file://raise-limits.patch;apply=yes \
-file://splashimage-command.patch;apply=yes \
-file://cmd-unzip.patch;apply=yes \
-file://enable-splash-bmp.patch;apply=yes \
-file://preboot-override.patch;apply=yes \
-file://lowlevel_foo.patch;apply=yes \
-file://default-env.patch;apply=yes \
-file://console-ansi.patch;apply=yes \
-file://boot-menu.patch;apply=yes \
-file://uboot-dfu.patch;apply=yes \
-file://uboot-neo1973-defaultenv.patch;apply=yes \
-file://uboot-nand-markbad-reallybad.patch;apply=yes \
-file://usbdcore-multiple_configs.patch;apply=yes \
-file://neo1973-chargefast.patch;apply=yes \
-file://uboot-s3c2440.patch;apply=yes \
-file://uboot-smdk2440.patch;apply=yes \
-file://uboot-hxd8.patch;apply=yes \
-file://uboot-license.patch;apply=yes \
-file://uboot-gta02.patch;apply=yes \
-file://uboot-s3c2443.patch;apply=yes \
-file://uboot-smdk2443.patch;apply=yes \
-file://unbusy-i2c.patch;apply=yes \
-file://makefile-no-dirafter.patch;apply=yes \
+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
index d84cd81..05463f8 100644
--- a/recipes/u-boot/u-boot-mkimage_1.3.2.bb
+++ b/recipes/u-boot/u-boot-mkimage_1.3.2.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 SECTION = "bootloader"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
-           file://fix-arm920t-eabi.patch;apply=yes"
+           file://fix-arm920t-eabi.patch"
 
 PR = "r1"
 
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 b5660cd..2114a83 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;apply=yes \
+           file://u-boot-makefile-3.81.patch \
           "
 
 S = "${WORKDIR}/u-boot"
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 d5ad38b..d88d3d2 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;apply=yes \
-           file://armv7-a.patch;apply=yes \
-           file://500mhz-l2enable.patch;apply=yes \
-           file://disable-tone-logo.patch;apply=yes \
-           file://env.patch;apply=yes \
+           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-openmoko_git.bb b/recipes/u-boot/u-boot-openmoko_git.bb
index 20558ec..bd7b671 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;apply=yes \
+  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 92ec009..7cf77b8 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;apply=yes \
-        file://tools-Makefile.patch;apply=yes \
-        file://env-Makefile.patch;apply=yes \
+        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 fb368c8..127be68 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;apply=yes "
+	   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;apply=yes"
-SRC_URI_append_vibren = "ftp://bec-systems.com/pub/pxa255_idp/u-boot/uboot_pxa255-idp_2005-03-23.patch;apply=yes"
-SRC_URI_append_mnci   = "file://mnci.patch;apply=yes \
-                         file://mnci-jffs2.patch;apply=yes \
-                         file://cmd-arm-linux.patch;apply=yes \
-                         file://command-names.patch;apply=yes"
-
-SRC_URI_append_magicbox  = "file://u-boot-emetec.patch;apply=yes "
+                   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 57e9d3d..78d607b 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;apply=yes"
+          file://u-boot-make381-fix.patch"
 
 SRC_URI_append_gumstix = "\
-	file://u-boot-autoscript.patch;apply=yes \
-	file://u-boot-base.patch;apply=yes \
-	file://u-boot-crc-warning-not-so-scary.patch;apply=yes \
-	file://u-boot-flash-protect-fixup.patch;apply=yes \
-	file://u-boot-fw_printenv.patch;apply=yes \
-	file://u-boot-install.patch;apply=yes \
-	file://u-boot-jerase-cmd.patch;apply=yes \
-	file://u-boot-jffs2-new-nodetypes.patch;apply=yes \
-	file://u-boot-loadb-safe.patch;apply=yes \
-	file://u-boot-mmc-init.patch;apply=yes \
-	file://u-boot-mmcclk-alternate.patch;apply=yes \
-	file://u-boot-smc91x-multi.patch;apply=yes \
-	file://u-boot-zzz-osx.patch;apply=yes"
+	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;apply=yes;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;apply=yes"
+        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;apply=yes;name=avrpatch \
-	file://avr32-boards-fix-flash-read.patch;apply=yes \
-	file://lcdc-driver-for-avr32.patch;apply=yes \
-	file://spi-driver-for-avr32.patch;apply=yes \
-	file://at32ap-add-framebuffer-address.patch;apply=yes \
-	file://at32ap-add-spi-initcalls.patch;apply=yes \
-	file://at32ap-add-system-manager-header-file.patch;apply=yes \
-	file://ap7000-add-spi-device-and-lcdc-base-address.patch;apply=yes \
-	file://libavr32-add-spi-and-lcd-board-support.patch;apply=yes \
-	file://cmd-bmp-add-gzip-compressed-bmp.patch;apply=yes \
-	file://lcd-add-24-bpp-support-and-atmel-lcdc-support.patch;apply=yes \
-	file://atstk1000-spi-support.patch;apply=yes \
-	file://atstk1000-ltv350qv-display-support.patch;apply=yes \
-	file://atstk1000-add-lcd-and-spi-to-config.patch;apply=yes \
-	file://at32ap-add-define-for-sdram-test.patch;apply=yes \
-	file://fix-mmc-data-timeout.patch;apply=yes \
+	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 9bc4293..7342c97 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;apply=yes \
+           file://devkit-idp.patch \
 "
 
-SRC_URI_append_sarge-at91 = " file://sarge-uboot.patch;apply=yes"
+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;apply=yes \
-                                 file://u-boot-1.1.6-fsl-1-Fix-the-UEC-driver-bug-of-QE.patch;apply=yes \
-                                 file://u-boot-1.1.6-fsl-1-streamline-the-83xx-immr-head-file.patch;apply=yes \
-                                 file://u-boot-1.1.6-fsl-1-Add-support-for-the-MPC832XEMDS-board.patch;apply=yes \
-                                 file://u-boot-1.1.6-fsl-1-Add-the-MPC832XEMDS-board-readme.patch;apply=yes \
-                                 file://u-boot-1.1.6-fsl-1-Added-MPC8323E-RDB-board-support-2.patch;apply=yes \
-                                 file://u-boot-1.1.6-fsl-1-UEC-remove-udelay.patch;apply=yes \
-                                 file://u-boot-1.1.6-83xx-optimizations.patch;apply=yes \ 
+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 0469f04..b05c181 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;apply=yes"
+SRC_URI_append_turbostation = "file://qnap.diff"
 
-SRC_URI_append_lsppchg = "file://u-boot-kurobox.patch;apply=yes \
-			  file://u-boot-kurobox-fdt.patch;apply=yes \
+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;apply=yes \ 
-                          file://u-boot-kurobox-fdt.patch;apply=yes \ 
+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;apply=yes"
+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;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-soc.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-PHY.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-platform.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-nand-controller.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-nand-boot.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-serdes.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-pcie.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-fsl-1.3.0-MPC83xx-CW.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-silicon-1.1-1.2.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-extra-config-for-333-266MHz.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-resume-deep-sleep.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-improve-ddr-performance.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-fix-PCI-IO-base.patch;apply=yes \ 
+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 5c9bf59..930e96f 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;apply=yes \
-           file://mpc8313e-rdb-mtdparts.patch;apply=yes \
-           file://mpc8313e-rdb-nand.patch;apply=yes"
+           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 08cd40b..dc3122d 100644
--- a/recipes/u-boot/u-boot_1.3.2.bb
+++ b/recipes/u-boot/u-boot_1.3.2.bb
@@ -7,38 +7,38 @@ 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;apply=yes \
-           file://mpc8313e-rdb-nand.patch;apply=yes \
-           file://mpc8313e-rdb-mtdparts.patch;apply=yes \
-           file://mpc8313e-rdb-eeprom.patch;apply=yes \
-           file://mpc8313e-rdb-lm75.patch;apply=yes \
-           file://u-boot-fsl-1.3.0-mpc8313erdb-vsc7385-support.patch;apply=yes \
-           file://u-boot-fsl-1.3.0-mpc8313erdb-fix-vitesse-7385-firmware.patch;apply=yes \
-           file://u-boot-fsl-1.3.0-mpc8313erdb-performance-tuning-for-TSEC.patch;apply=yes \
-           file://gcc4-weak-inline.patch;apply=yes \
-           file://linker-script-sort-rodata-sections.patch;apply=yes \
+           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;apply=yes \
-           file://mpc8313e-rdb-nand.patch;apply=yes \
-           file://mpc8313e-rdb-mtdparts.patch;apply=yes \
-           file://mpc8313e-rdb-eeprom.patch;apply=yes \
-           file://001-090205-SPI.patch;apply=yes \
-           file://002-081212-GPIO.patch;apply=yes \
-           file://003-081205-DTT_LM73.patch;apply=yes \
-           file://004-081205-WATCHDOG.patch;apply=yes \
-           file://006-081211-EEPROM_M24C32.patch;apply=yes \
-           file://007-090217-CAPSENSE.patch;apply=yes \
-           file://008-090107-TSEC.patch;apply=yes \
-           file://009-081212-EXIO.patch;apply=yes \
-           file://010-081212-LCD.patch;apply=yes \
-           file://011-081211-CMD_TEST.patch;apply=yes \
-           file://012-081209-BUG_SETENV.patch;apply=yes \
-           file://013-090206-FIX_OOB_8BITS_LARGEPAGE_NAND.patch;apply=yes \
-           file://014-081211-BOOT_RESCUE.patch;apply=yes \
-           file://015-090205-EMC.patch;apply=yes \
-           file://016-090209-PM.patch;apply=yes \
+           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 4de17fd..4e5ca48 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;apply=yes \
-	   file://u-boot-2009.01-exp-003-drivers-net-macb.c.patch;apply=yes \
+	   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;apply=yes \
-	   file://u-boot-2009.01-exp-003-drivers-net-macb.c.patch;apply=yes \
-           file://at91sam9g20-fix-config.patch;apply=yes \
+	   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 ad47581..124a78c 100644
--- a/recipes/u-boot/u-boot_2009.03.bb
+++ b/recipes/u-boot/u-boot_2009.03.bb
@@ -8,11 +8,11 @@ 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;apply=yes \
-	file://01-hipox-fix-gmac-reset.patch;apply=yes \
-	file://02-hipox-enable-mmu.patch;apply=yes \
-	file://03-hipox-direct-switch.patch;apply=yes \
-	file://04-hipox-env.patch;apply=yes \
+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 \
 "
 
 TARGET_LDFLAGS = ""
diff --git a/recipes/u-boot/u-boot_2009.08.bb b/recipes/u-boot/u-boot_2009.08.bb
index 6670898..32037f2 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;apply=yes \
-	file://add-board-support-for-IGEP-v2-series-rev-B.patch;apply=yes \
+	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 97aa56f..8dca7cf 100644
--- a/recipes/u-boot/u-boot_git.bb
+++ b/recipes/u-boot/u-boot_git.bb
@@ -14,48 +14,48 @@ SRCREV_palmpre = "6b8edfde22acc574b5532e9f086e6a7287a9bc78"
 SRCREV_cm-t35 = "3c014f1586d5bfe30dca7549396915c83f31cd30"
 SRCREV_mpc8641-hpcn = "f20393c5e787b3776c179d20f82a86bda124d651"
 SRCREV_p2020ds = "f20393c5e787b3776c179d20f82a86bda124d651"
-SRC_URI_append_afeb9260 = " file://AFEB9260-network-fix.patch;apply=yes"
-SRC_URI_append_afeb9260-180 = " file://AFEB9260-network-fix.patch;apply=yes"
-SRC_URI_append_cm-t35 = "file://cm-t35/cm-t35.patch;apply=yes"
+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;apply=yes \
-                       file://0002-OMAP3-add-board-revision-detection-for-Overo.patch;apply=yes \
-                       file://0003-OMAP3-update-Beagle-revision-detection-to-recognize-.patch;apply=yes \
-                       file://0004-OMAP3-Set-VAUX2-to-1.8V-for-EHCI-PHY-on-Beagle-Rev-C.patch;apply=yes \
-                       file://0005-OMAP3-add-entry-for-rev-3.1.2-check-and-display-max-.patch;apply=yes \
-                       file://0006-OMAP3-add-mpurate-boot-arg-for-overo-and-beagle.patch;apply=yes \
-                       file://0007-OMAP3-detect-expansion-board-type-version-using-eepr.patch;apply=yes \
-                       file://0008-OMAP3-Overo-enable-config-eeprom-to-set-u-boot-env-v.patch;apply=yes \
-                       file://0009-OMAP3-Overo-enable-input-on-MMC1_CLK-and-MMC3_CLK-pi.patch;apply=yes \
-                       file://0010-OMAP3-Overo-set-CONFIG_SYS_I2C_SPEED-to-400Khz.patch;apply=yes \
-                       file://0011-OMAP3-trim-excessively-long-delays-in-i2c-driver.patch;apply=yes \
-                       file://0012-OMAP3-Overo-allow-expansion-boards-with-any-vendor-I.patch;apply=yes \
-                       file://0013-OMAP3-Overo-change-address-of-expansion-eeprom-to-0x.patch;apply=yes \
-                       file://0014-OMAP3-board.c-don-t-attempt-to-set-up-second-RAM-ban.patch;apply=yes \
-                       file://0015-OMAP3-mem.c-enhance-the-RAM-test.patch;apply=yes \
-                       file://0016-env_nand.c-fail-gracefully-if-no-nand-is-present.patch;apply=yes \
-                       file://0017-OMAP3-add-definitions-to-support-sysinfo-cpu-and-cpu.patch;apply=yes \
-                       file://0018-OMAP3-sys_info-update-cpu-detection-for-36XX-37XX.patch;apply=yes \
-                       file://0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch;apply=yes \
-                       file://0020-OMAP3-beagle-add-support-for-Beagle-xM.patch;apply=yes \
-                       file://0021-OMAP3-Beagle-Overo-remove-omapfb.debug-y-from-defaul.patch;apply=yes \
-                       file://0022-OMAP3-beagle-implement-expansionboard-detection-base.patch;apply=yes \
-                       file://0023-beagleboard-display-message-about-I2C-errors-being-e.patch;apply=yes \
-                       file://0024-beagleboard-fix-TCT-expansionboard-IDs.patch;apply=yes \
-                       file://0025-Add-DSS-driver-for-OMAP3.patch;apply=yes \
-                       file://0026-Enable-DSS-driver-for-Beagle.patch;apply=yes \
-                       file://0027-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch;apply=yes \
-                       file://0028-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch;apply=yes \
-                       file://0029-OMAP3-convert-setup_auxcr-to-pure-asm.patch;apply=yes \
-                       file://0030-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch;apply=yes \
-                       file://0031-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch;apply=yes \
-                       file://0032-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch;apply=yes \
-                       file://0033-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch;apply=yes \
-                       file://0034-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch;apply=yes \
-                       file://0035-OMAP3-Beagle-set-mpurate-to-1000-for-xM.patch;apply=yes \
-                       file://0036-OMAP3-Beagle-decrease-bootdelay-to-3-use-VGA-for-def.patch;apply=yes \
-                       file://0037-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch;apply=yes \
+                       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 = "ca6e1c136ddb720c3bb2cc043b99f7f06bc46c55"
@@ -66,29 +66,29 @@ SRCREV_calamari = "533cf3a024947aaf74c16573a6d951cd0c3d0a7d"
 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;apply=yes \
-	file://0001-cmd_i2c.c-reduced-subaddress-length-to-3-bytes.patch;apply=yes \
-	file://0002-cmd_bootm.c-made-subcommand-array-static.patch;apply=yes \
-	file://0003-cmd_i2c.c-reworked-subcommand-handling.patch;apply=yes \
-	file://0004-cmd_i2c.c-sorted-commands-alphabetically.patch;apply=yes \
-	file://0005-cmd_i2c.c-added-i2c-read-to-memory-function.patch;apply=yes \
-	file://0007-cmd_setexpr-allow-memory-addresses-and-env-vars-in-e.patch;apply=yes \
+	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;apply=yes \
-                 file://600mhz.patch;apply=yes \
-                 file://new-pinmux.patch;apply=yes \
-                 file://spi3.patch;apply=yes \
-                 file://spi4.patch;apply=yes \
-                 file://headphone.patch;apply=yes \
-                 file://power.patch;apply=yes \
-                 file://ai-logo.patch;apply=yes \
-                 file://mmcinit.patch;apply=yes \
-                 file://touchbook-config.patch;apply=yes \
+                 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${SRCREV}"
@@ -105,22 +105,22 @@ 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;apply=yes \
-file://omap3evm/0002-Fix-for-NFS-boot-for-OMAP3-EVM.patch;apply=yes \
-file://omap3evm/0003-OMAP3-timer-handling-to-1ms-tick-and-CONFIG_SYS_HZ-t.patch;apply=yes \
-file://omap3evm/0004-Reverse-patch-for-NFS-boot-to-fix-comments-provided.patch;apply=yes \
-file://omap3evm/0005-SMC911x-driver-fixed-for-NFS-boot.patch;apply=yes \
-file://omap3evm/0006-Added-OMAP3517-3505-support.patch;apply=yes \
-file://omap3evm/0007-OMAP3517TEB-validated-on-OMAP3517TEB-board.patch;apply=yes \
-file://omap3evm/0008-OMAP3517PRE-ALPHA-validated-on-OMAP3517PRE_ALPHA-bo.patch;apply=yes \
-file://omap3evm/0009-OMAP3517PRE-ALPHA-DDR-size-issue-fixed.patch;apply=yes \
-file://omap3evm/0010-OMAP3517PRE-ALPHA-Mux-configuration-for-MMC-CD-and.patch;apply=yes \
-file://omap3evm/0011-Ethernet-driver-functional-no-need-for-time-delay.patch;apply=yes \
-file://omap3evm/0012-EMAC-driver-Implement-GPIO-driven-PHY-reset.patch;apply=yes \
-file://omap3evm/0013-Cleaned-up-during-EVM-hang-issue.patch;apply=yes \
-file://omap3evm/0014-EMAC-driver-cleanup-removed-debug-prints.patch;apply=yes \
-file://omap3evm/0015-EMAC-driver-Check-for-link-status-in-packet-send-lo.patch;apply=yes \
-file://omap3evm/0016-Config-option-and-name-changed-to-omap3517_evm.patch;apply=yes \
+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${SRCREV}"
 
@@ -129,7 +129,7 @@ SRCREV_omapzoom = "d691b424f1f5bf7eea3a4131dfc578d272e8f335"
 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;apply=yes"
+                     file://0001-OMAP3-set-L1NEON-bit-in-aux-control-register.patch"
 SRCREV_omapzoom2 = "78e778e0ea884306841c6499851a1e35177d81d0"
 PV_omapzoom2 = "1.1.4+${PR}+gitr${SRCREV}"
 PE_omapzoom2 = "1"
@@ -158,8 +158,8 @@ do_compile_omapzoom36x () {
 }
 
 SRC_URI_overo = "git://gitorious.org/u-boot-omap3/mainline.git;branch=omap3-dev;protocol=git \
-                 file://fw-env.patch;apply=yes \
-                 file://dss2.patch;apply=yes \
+                 file://fw-env.patch \
+                 file://dss2.patch \
 "
 SRCREV_overo = "2dea1db2a3b7c12ed70bbf8ee50755089c5e5170"
 PV_overo = "2009.03+${PR}+gitr${SRCREV}"
@@ -224,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;apply=yes"
-SRC_URI_append_akita = "file://pdaXrom-u-boot.patch;apply=yes \
-                        file://uboot-eabi-fix-HACK2.patch;apply=yes \
-                        file://akita-standard-partitioning.patch;apply=yes \
+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;apply=yes \
-                        file://uboot-eabi-fix-HACK2.patch;apply=yes \
-                        file://spitz-standard-partitioning.patch;apply=yes \
+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;apply=yes \
-                       file://uboot-eabi-fix-HACK2.patch;apply=yes \
-                       file://corgi-standard-partitioning.patch;apply=yes \
+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 e430258..8390e38 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;apply=yes"
+	   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 c8b72d4..cb662e3 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;apply=yes"
+           file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/ubahnnav/ubahnnav_0.4.1.bb b/recipes/ubahnnav/ubahnnav_0.4.1.bb
index c08dd59..72f882b 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;apply=yes"
+	   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 fb8062a..1222a4a 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;apply=yes \
+	   file://nobash.patch \
 	   file://defconfig"
 S = "${WORKDIR}/uClibc++"
 
diff --git a/recipes/uclibc/uclibc_0.9.28.bb b/recipes/uclibc/uclibc_0.9.28.bb
index 5e8da03..a43d5ed 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;apply=yes"
+#SRC_URI += "file://nokernelheadercheck.patch"
 #
 # Thumb support
 #
 # Thumb interworking support
 THUMBSTUFF = " \
-              file://thumb-defined-arm-or-thumb.patch;apply=yes \
-              file://thumb-mov-pc-bx.patch;apply=yes \
-              file://thumb-swi-r7.patch;apply=yes \
-              file://thumb-sysnum-h.patch;apply=yes \
-              file://thumb-asm-swi.patch;apply=yes \
-              file://thumb-call-via-rx.patch;apply=yes \
-              file://dl-startup.h.patch;apply=yes \
-              file://dl-string.h.patch;apply=yes \
-              file://dl-sysdep.h.patch;apply=yes \
-              file://uclibc-libgcc-eh.patch;apply=yes \
+              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;apply=yes"
+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;apply=yes \
-                        file://remove-bogus-version-hack-and-just-use-asm-generic-if-it-exists.patch;apply=yes \
-                        file://let-optimized-stringops-override-default-ones.patch;apply=yes \
-                        file://fix-getrusage-argument-type.patch;apply=yes \
-                        file://fix-__libc_fcntl64-varargs-prototype.patch;apply=yes \
-                        file://fix-broken-__libc_open-declaration.patch;apply=yes \
-                        file://avr32-arch-2.patch;apply=yes \
-                        file://avr32-linkrelax-option.patch;apply=yes \
-                        file://avr32-string-ops.patch;apply=yes \
-                        file://no-create_module-on-avr32.patch;apply=yes \
-                        file://ldso-always-inline-_dl_memcpy.patch;apply=yes \
-                        file://ldso-define-MAP_FAILED.patch;apply=yes \
-                        file://ldso-always-inline-syscalls.patch;apply=yes \
-                        file://ldso-avr32-2.patch;apply=yes \
-                        file://ldso-avr32-needs-CONSTANT_STRING_GOT_FIXUP.patch;apply=yes \
-                        file://ldso-avr32-startup-hack.patch;apply=yes \
-                        file://ldd-avr32-support.patch;apply=yes \
-                        file://libpthread-avr32.patch;apply=yes \
-                        file://sync-fcntl-h-with-linux-kernel.patch;apply=yes \
+                        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;apply=yes \
-#file://uClibc-0.9.28-avr32-20061019.patch;apply=yes \
-#file://uclibc-avr32-no-msoft-float.patch;apply=yes \
+#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 01f848a..b83cd2e 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;apply=yes \
-		file://termios.h.patch;apply=yes \
-		file://unistd_arm.patch;apply=yes \
-		file://build_wcs_upper_buffer.patch;apply=yes \
-		file://uClibc-0.9.29-001-fix-mmap.patch;apply=yes \
-		file://uClibc-0.9.29-002-atmel.1.patch;apply=yes \
-		file://uClibc-0.9.29-avr32-fix-sa_onstack.patch;apply=yes \
-		file://uClibc-0.9.29-conditional-sched_affinity.patch;apply=yes \
-		file://uClibc-0.9.29-fix-gethostent_r-failure-retval.patch;apply=yes \
-		file://uClibc-0.9.29-fix-internal_function-definition.patch;apply=yes \
-		file://uClibc-0.9.29-rm-whitespace.patch;apply=yes \
-		file://uClibc-0.9.29-avr32-bzero.patch;apply=yes \
-		file://uClibc-0.9.29-nonposix_bashisms.patch;apply=yes \
-		file://arm_fix_alignment.patch;apply=yes \
-		file://uclibc-arm-ftruncate64.patch;apply=yes \
-		file://uclibc-use-fgnu89-inline.patch;apply=yes \
+		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 18126cb..ea69249 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;apply=yes \
-            file://linuxthreads-changes.patch;apply=yes \
-	    file://pthread_atfork.patch;apply=yes \
-	    file://uclibc_ldso_use_O0.patch;apply=yes \
-	    file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;apply=yes \
-	    file://gcc-4.4-fixlet.patch;apply=yes \
-	    file://uclibc-c99-ldbl-math.patch;apply=yes \
-	    file://Use-__always_inline-instead-of-__inline__.patch;apply=yes \
-            file://installfix.patch;apply=yes \
-            file://o_cloexec.patch;apply=yes \
+            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 ea94db1..f3ba501 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;apply=yes \
-	    file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;apply=yes \
-            file://installfix.patch;apply=yes \
-            file://o_cloexec.patch;apply=yes \
-            file://uclibc_fix_mips_crt.patch;apply=yes \
+	    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 6f66fc8..2f5f23c 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;apply=yes \
+	    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 a4f8a81..5d267b5 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;apply=yes \
-            file://linuxthreads-changes.patch;apply=yes \
-	    file://pthread_atfork.patch;apply=yes \
-	    file://uclibc_ldso_use_O0.patch;apply=yes \
-	    file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;apply=yes \
-            file://unifdef-fix.patch;apply=yes \
-	    file://Use-__always_inline-instead-of-__inline__.patch;apply=yes \
+            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 c7d997a..74b4a20 100644
--- a/recipes/uclibc/uclibc_git.bb
+++ b/recipes/uclibc/uclibc_git.bb
@@ -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;apply=yes \
-	file://uclibc_enable_log2_test.patch;apply=yes \
-	file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;apply=yes \
+	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/udev/udev-static_124.bb b/recipes/udev/udev-static_124.bb
index fa3cd5c..bcd3138 100644
--- a/recipes/udev/udev-static_124.bb
+++ b/recipes/udev/udev-static_124.bb
@@ -1,12 +1,12 @@
 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;apply=yes \
-	   file://flags.patch;apply=yes \
-	   file://vol_id_ld.patch;apply=yes \
-	   file://udevtrigger_add_devname_filtering.patch;apply=yes \
-	   file://libvolume-id-soname.patch;apply=yes \
-	   file://mtd-exclude-persistent.patch;apply=yes \
+	   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
diff --git a/recipes/udev/udev_092.bb b/recipes/udev/udev_092.bb
index fe239a1..48929d3 100644
--- a/recipes/udev/udev_092.bb
+++ b/recipes/udev/udev_092.bb
@@ -6,12 +6,12 @@ RPROVIDES_${PN} = "hotplug"
 PR = "r25"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
-	   file://noasmlinkage.patch;apply=yes \
-	   file://flags.patch;apply=yes \
-	   file://udevsynthesize.patch;apply=yes \
+	   file://noasmlinkage.patch \
+	   file://flags.patch \
+	   file://udevsynthesize.patch \
 	   file://udevsynthesize.sh \
-           file://arm_inotify_fix.patch;apply=yes \
-	   file://mtd-exclude-persistent.patch;apply=yes \
+           file://arm_inotify_fix.patch \
+	   file://mtd-exclude-persistent.patch \
 	   file://mount.blacklist \
 	   "
 
diff --git a/recipes/udev/udev_097.bb b/recipes/udev/udev_097.bb
index 15f61bb..8d63fea 100644
--- a/recipes/udev/udev_097.bb
+++ b/recipes/udev/udev_097.bb
@@ -11,8 +11,8 @@ needed to link programs with libvolume_id."
 PR = "r13"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
-	   file://noasmlinkage.patch;apply=yes \
-	   file://flags.patch;apply=yes \
+	   file://noasmlinkage.patch \
+	   file://flags.patch \
 	   file://mount.blacklist \
 	   "
 
diff --git a/recipes/udev/udev_100.bb b/recipes/udev/udev_100.bb
index 59d7ca5..9ebf707 100644
--- a/recipes/udev/udev_100.bb
+++ b/recipes/udev/udev_100.bb
@@ -12,9 +12,9 @@ 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;apply=yes \
-	   file://flags.patch;apply=yes \
-	   file://mtd-exclude-persistent.patch;apply=yes \
+	   file://noasmlinkage.patch \
+	   file://flags.patch \
+	   file://mtd-exclude-persistent.patch \
 	   file://mount.blacklist \
 	   file://mount.sh \
 	   "
diff --git a/recipes/udev/udev_118.bb b/recipes/udev/udev_118.bb
index a3ab733..c16ee86 100644
--- a/recipes/udev/udev_118.bb
+++ b/recipes/udev/udev_118.bb
@@ -9,10 +9,10 @@ DEFAULT_PREFERENCE = "-118"
 
 SRC_URI = "\
  http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
- file://flags.patch;apply=yes \
- file://vol_id_ld.patch;apply=yes \
- file://udevtrigger_add_devname_filtering.patch;apply=yes \
- file://mtd-exclude-persistent.patch;apply=yes \
+ 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}"
diff --git a/recipes/udev/udev_124.bb b/recipes/udev/udev_124.bb
index acb3ebe..35e0618 100644
--- a/recipes/udev/udev_124.bb
+++ b/recipes/udev/udev_124.bb
@@ -5,12 +5,12 @@ RPROVIDES_${PN} = "hotplug"
 PR = "r19"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
-	   file://noasmlinkage.patch;apply=yes \
-	   file://flags.patch;apply=yes \
-	   file://vol_id_ld.patch;apply=yes \
-	   file://udevtrigger_add_devname_filtering.patch;apply=yes \
-	   file://libvolume-id-soname.patch;apply=yes \
-	   file://mtd-exclude-persistent.patch;apply=yes \
+	   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 \
diff --git a/recipes/udhcp/udhcp_0.9.8.bb b/recipes/udhcp/udhcp_0.9.8.bb
index bafe680..941935a 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;apply=yes \
-	   file://nostrip.patch;apply=yes \
-	   file://gcc3.patch;apply=yes"
+	   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 691e226..b69d6b1 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;apply=yes \
+        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 e827403..c161571 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;apply=yes \
-           file://gcc3_4.patch;apply=yes \
-           file://gcc4.patch;apply=yes \
-           file://gcc4_1.patch;apply=yes \
-           file://64bit-cleanup.patch;apply=yes \
-	   file://kernel-asm-page.patch;apply=yes"
+           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 ea430e4..ab4ab80 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;apply=yes \
-           file://64bit-cleanup.patch;apply=yes"
+           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 41e7298..1124226 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;apply=yes"
+           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 1d35824..dad6865 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;apply=yes"
+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 1d8e146..4245c8c 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;apply=yes \
-	file://ulogd-hash-style-gnu.patch;apply=yes \
+	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 d71c764..b5ca1cd 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;apply=yes \
-           file://remove-local-includes.patch;apply=yes"
+           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 da96e1c..0d26b7a 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;apply=yes"
+           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 ebc64b0..38137b9 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;apply=yes"
+           file://cross.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/unicap/ucview_0.30.bb b/recipes/unicap/ucview_0.30.bb
index 8aea042..859c8b0 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;apply=yes"
+           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 2dd3174..4a47bc4 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;apply=yes"
+           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 d38e15e..8b6f8c3 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;apply=yes"
+           file://pkgconfig.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/units/units_1.80.bb b/recipes/units/units_1.80.bb
index 7323195..1121522 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;apply=yes \
-	   file://makefile.patch;apply=yes"
+	   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 29a03d4..f0a7ae5 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;apply=yes"
+		file://makefile.unix.patch"
 SRC_URI[unrar.md5sum] = "4271fc8710d299341c969666492b305c"
 SRC_URI[unrar.sha256sum] = "460d4c014f5aaaa9b1c810dca180f07e155678b322169e20f4e51c616fa0e7ff"
 
diff --git a/recipes/update-alternatives/update-alternatives-cworth.inc b/recipes/update-alternatives/update-alternatives-cworth.inc
index db0f8bc..7fe7795 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;apply=yes \
-           file://use-opkg-dir-instead-of-ipkg.patch;apply=yes "
+           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 cc2bb5a..e7bd90d 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;apply=yes"
+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 296dafa..d2d22ab 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;apply=yes"
+           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 dfe0b97..053d71e 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;apply=yes"
+           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 ade9168..cd49b66 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;apply=yes"
+           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 e64655b..c623724 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;apply=yes"
+           file://dlna.diff"
 
 inherit autotools
 
diff --git a/recipes/upstart/upstart_0.3.8.bb b/recipes/upstart/upstart_0.3.8.bb
index 7e90c4e..1b2cfb5 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;apply=yes"
+file://autoconf_version.patch"
 
 PR = "r1"
 
diff --git a/recipes/uqm/uqm_0.3.bb b/recipes/uqm/uqm_0.3.bb
index 207585b..65dbe58 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;apply=yes;striplevel=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 e673c04..ad315ea 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;apply=yes;striplevel=0 \
+           file://build-oe.patch;striplevel=0 \
 "
 
 do_configure() {
diff --git a/recipes/usbview/usbview_1.0.bb b/recipes/usbview/usbview_1.0.bb
index dff41b2..2240da3 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;apply=yes"
+	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 0f970c7..a4708b6 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;apply=yes;striplevel=3 \
-           file://install_test.patch;apply=yes"
+           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;apply=yes"
+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 c89c9fb..10d4116 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -15,7 +15,7 @@ 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;apply=yes "
+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 \
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 5087aad..c13526d 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;apply=yes \
-	    file://util-linux-ng-replace-siginterrupt.patch;apply=yes \
+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 febd834..dc52fa6 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;apply=yes \
-            file://optional-uuid.patch;apply=yes \
-            file://uclibc-compile.patch;apply=yes \
+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 0829e5f..614e40e 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;apply=yes \
-            file://tls.patch;apply=yes \
-	    file://util-linux-ng-replace-siginterrupt.patch;apply=yes \
+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 2a3b181..b435211 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;apply=yes \
-	    file://util-linux-ng-replace-siginterrupt.patch;apply=yes \
+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 655157d..c583883 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;apply=yes \
+           file://gcc34.patch \
            file://MCONFIG \
            file://make_include \
            file://swapargs.h \
-	   file://fdiskbsdlabel_thumb.diff;apply=yes \
+	   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 2557e67..01b0ad6 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;apply=yes \
+           file://gcc34.patch \
            file://MCONFIG \
            file://make_include \
            file://swapargs.h \
-	   file://fdiskbsdlabel_thumb.diff;apply=yes \
-	   file://umount.diff;apply=yes \
+	   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 0102bb0..79a5572 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;apply=yes \
-           file://ioctl.diff;apply=yes"
+           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 e1c16eb..0a7f69c 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;apply=yes"
-SRC_URI += "file://glibc-fix.patch;apply=yes"
-SRC_URI += "file://glibc-umount2.patch;apply=yes"
-SRC_URI += "file://fdiskbsdlabel-avr32.patch;apply=yes" 
-SRC_URI += "file://util-linux-2.12r-cramfs-1.patch;apply=yes" 
+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 59e8edb..b8a62e8 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;apply=yes"
+           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 3efe757..cefe6e9 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;apply=yes \
+  file://use-png-icons.patch \
 "
 
 inherit autotools
diff --git a/recipes/vblade/vblade_19.bb b/recipes/vblade/vblade_19.bb
index f58cec2..f100a46 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;apply=yes"
+	   file://cross.patch"
 
 inherit autotools
 
diff --git a/recipes/vdr/vdr_1.7.10.bb b/recipes/vdr/vdr_1.7.10.bb
index c7593f2..8cc5757 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;apply=yes \
-           file://cplusplus.patch;apply=yes \
-           file://disable_plugin.patch;apply=yes \
-           file://linkerflags.patch;apply=yes \
+SRC_URI += " file://fixpaths.patch \
+           file://cplusplus.patch \
+           file://disable_plugin.patch \
+           file://linkerflags.patch \
           "
 
-SRC_URI_append_linux-uclibceabi = " file://libintl.patch;apply=yes "
-SRC_URI_append_uclinux-uclibc = " file://libintl.patch;apply=yes "
+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 665b59e..02170e7 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;apply=yes \
-	file://viking-parallel-build.patch;apply=yes"
+	file://viking-openaerialmap.patch \
+	file://viking-parallel-build.patch"
 
 # libgps is linked with c++
 #export CC='${CC} -lstdc++'
diff --git a/recipes/vlc/vlc-gpe_0.8.1.bb b/recipes/vlc/vlc-gpe_0.8.1.bb
index f5bc082..9d2ead0 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;apply=yes \
-	file://vlc-tremor.patch;apply=yes"
+	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 8add5a1..b09566e 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;apply=yes"
+	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/vnc/fbvncserver-kmodule_0.9.4.bb b/recipes/vnc/fbvncserver-kmodule_0.9.4.bb
index b290b83..15a4102 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;apply=yes \
-	   file://paths.patch;apply=yes \
-	   file://kernelinclude.patch;apply=yes \
-           file://ipaq.patch;apply=yes"
+           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 96a851c..7a913bb 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;apply=yes \
-           file://paths.patch;apply=yes \
-           file://kernelinclude.patch;apply=yes \
-	   file://buildfix.patch;apply=yes \
-	   file://ipaq.patch;apply=yes \
+           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 4ad6047..958f0a2 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;apply=yes \
-            file://clientlogger.patch;apply=yes \
-            file://autoreconf.patch;apply=yes"
+            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 e8feeb1..7374c13 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;apply=yes"
+	   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 5ad4324..3ae12a9 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;apply=yes"
+           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 8f76727..e9c01da 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;apply=yes \
-           file://remove-deprecated-curl-option.patch;apply=yes"
+           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 6696d1b..10802d6 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;apply=yes \
+           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 bfeef68..59f191f 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;apply=yes \
+           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 9fcfe7e..2c5fc3d 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;apply=yes \
-           file://vpnc-install.patch;apply=yes \
+           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 8fa567e..6b9709e 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;apply=yes \
-           file://makefile.patch;apply=yes \
-           file://nopam.patch;apply=yes \
-           file://syscall.patch;apply=yes \
+           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 2375ef5..0b9e75d 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;apply=yes \
-           file://nopam.patch;apply=yes \
-           file://syscall.patch;apply=yes \
+           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 e21f1e4..490792e 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;apply=yes \
+  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 a5f9f5b..ddb988d 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;apply=yes;striplevel=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 ae7dd06..5ec857b 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;apply=yes"
+	   file://staticpaths.patch"
 
 S = "${WORKDIR}/w3cam-0.7.2/"
 
diff --git a/recipes/webkit/webkit-efl_git.bb b/recipes/webkit/webkit-efl_git.bb
index 23c9053..99942c3 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;apply=yes \
-           file://fix-build-with-newer-ecore.patch;apply=yes"
+           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 2fcbc3a..900921d 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;apply=yes \
-	file://autotools.patch;apply=yes \
-        file://ipv6-fix.patch;apply=yes \
+	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 c27a877..a50f602 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;apply=yes \
-        file://wifi-radar_destktop.patch;apply=yes "
+        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 ead6771..c97bc9e 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;apply=yes \
-			file://marvell-devicetable.patch;apply=yes \
-			file://marvell-gumstix.patch;apply=yes \
-			file://sbi-no-inline.patch;apply=yes \
-			file://2.6.17-new-pcmcia-layer.patch;apply=yes \
-			file://bad-cast.patch;apply=yes \
-			file://sk_buff.patch;apply=yes \
-			file://struct-changes.patch;apply=yes \
-			file://no-more-config-h.patch;apply=yes \
-			file://realtime-kernel.patch;apply=yes \
-			file://install-properly.patch;apply=yes \
-			file://fix-essid-truncation.patch;apply=yes"
+			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/wireless-tools/wireless-tools.inc b/recipes/wireless-tools/wireless-tools.inc
index b526acc..a6bc6a8 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;apply=yes \
-  file://shared_lib_ldflags.patch;apply=yes \
+  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 3cf0d73..4ffe8fa 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;apply=yes \
-           file://acinclude-net-snmp-fix.patch;apply=yes \
-           file://libtool-fix.patch;apply=yes \
-	   file://no-host-includes.patch;apply=yes"
+           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 e3630d6..610db05 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;apply=yes \
-           file://fix-configure.patch;apply=yes "
+           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 c3f4987..0bc20d1 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 c84c2b5..c974394 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;apply=yes \
-	file://msleep-vs-mdelay.patch;apply=yes \
-	file://might-sleep.patch;apply=yes \
-	file://only-the-modules.patch;apply=yes \
-#	file://module_param_array.patch;apply=yes \
-	file://scripts-makefile-hostcc.patch;apply=yes \
-	file://pcmciasrc.patch;apply=yes \
+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 d8dbfd9..6dea4e8 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;apply=yes"
+	    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 6cf9c65..0624bd4 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;apply=yes \
+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 4df2967..dced11c 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;apply=yes \
-	file://pcmciasrc.patch;apply=yes \
-	file://hostldflags.patch;apply=yes"
+        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 6fe5e38..42fafab 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;apply=yes \
-	file://pcmciasrc.patch;apply=yes \
-	file://hostldflags.patch;apply=yes"
+        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 ce0771c..9a9c1c7 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;apply=yes \
-	file://pcmciasrc.patch;apply=yes \
-	file://hostldflags.patch;apply=yes"
+        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 0d81a66..3a230c0 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;apply=yes \
-         file://session_manager.patch;apply=yes "
+         file://icons.patch \
+         file://session_manager.patch "
 
-SRC_URI_append_shr = "file://desktop.patch;apply=yes \
+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 ca5da2f..371f276 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;apply=yes \
+#	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 ac05856..00aa45d 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;apply=yes;striplevel=0 \
+	file://madwifi-bsd-fix.diff;striplevel=0 \
 	file://defconfig \
-        file://driver-hermes.patch;apply=yes \
-	file://driver-zd1211.patch;apply=yes \
+        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 ecdf9a3..17f7497 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;apply=yes;striplevel=0 \
+	file://madwifi-bsd-fix.diff;striplevel=0 \
 	file://defconfig \
-        file://driver-hermes.patch;apply=yes \
-	file://driver-zd1211.patch;apply=yes \
+        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 cfa2ea2..8c56521 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;apply=yes;striplevel=0 \
+	file://madwifi-bsd-fix.diff;striplevel=0 \
 	file://defconfig \
-        file://driver-hermes.patch;apply=yes \
-	file://driver-zd1211.patch;apply=yes \
+        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 cecdd8f..55b7e4e 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;apply=yes"
+	file://toolchain.patch"
 
 S = "${WORKDIR}/${P}"
 
diff --git a/recipes/wrt/wrt-utils.bb b/recipes/wrt/wrt-utils.bb
index 66237a7..e5145ea 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;apply=yes;striplevel=0 \
-	file://libshared-makefile.diff;apply=yes;striplevel=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 e8a54e1..9cda6ae 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;apply=yes \
-	file://wgooglemap.patch;apply=yes"
+	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 07c7592..0f4e7a6 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;apply=yes \
+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 9d15341..50027d2 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;apply=yes"
+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 ecabbaa..43a1132 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;apply=yes"
+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 b4a49e4..3fb2d18 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;apply=yes"
+	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 3bbfe9b..c25864a 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;apply=yes"
+	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 db390cc..89d0504 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;apply=yes"
+           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 674b4f9..c6af1af 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;apply=yes"
+           file://fixmakefile.patch"
 
 DEPENDS = "wvstreams"
 RDEPENDS = "ppp"
diff --git a/recipes/wview/wview-common.inc b/recipes/wview/wview-common.inc
index 6909213..713c455 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;apply=yes"
+	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 8a6bbe9..83f97be 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;apply=yes;name=patch22 \
-           file://wvstreams-debian.patch;apply=yes \
-           file://build-fixes-and-sanity.patch;apply=yes "
+           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 441035f..fa865c7 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;apply=yes \
-	file://dont-forget-header.patch;apply=yes \
-	file://gcc4.3.patch;apply=yes \
+	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 d1fe59c..06a1804 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;apply=yes \
-	file://wxtranslate.patch;apply=yes \
+	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 30d9a43..fb18710 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;apply=yes"
+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 8975564..677ef38 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;apply=yes"
+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 8cbece2..e343b27 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;apply=yes"
+SRC_URI += "file://gsockgtk-cpp-wx2810.diff"
 
 LEAD_SONAME = "libwx_gtk2_core-2.8.so"
 
diff --git a/recipes/x-load/x-load_1.41.bb b/recipes/x-load/x-load_1.41.bb
index 9aecdbc..042188b 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;apply=yes \
-file://0014-board.c-check-for-u-boot-on-mmc-on-all-configurati.patch;apply=yes \
-file://0015-OMAP3EVM-Build-issue-fixed.patch;apply=yes \
-file://0016-mmc-fix-infinite-loop-in-mmc_init_stream.patch;apply=yes \
-file://0017-lib-board.c-add-missing-call-to-misc_init_r.patch;apply=yes \
-file://0018-omap3evm-provide-missing-udelay-function.patch;apply=yes \
-file://0019-lib-board.c-Specify-where-u-boot-is-being-loaded-fr.patch;apply=yes \
-file://streen-fix.diff;apply=yes \
+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 719c3d3..d40e094 100644
--- a/recipes/x-load/x-load_git.bb
+++ b/recipes/x-load/x-load_git.bb
@@ -16,18 +16,18 @@ PE = "1"
 SRC_URI = "git://gitorious.org/x-load-omap3/mainline.git;branch=master;protocol=git"
 
 SRC_URI_append_beagleboard = " \
-                              file://name.patch;apply=yes \
-                              file://bb8547fcbc54ecc7a75f9ad45a31042a04d8a2ce.patch;apply=yes \
+                              file://name.patch \
+                              file://bb8547fcbc54ecc7a75f9ad45a31042a04d8a2ce.patch \
                              "
 
 SRC_URI_append_omap3-touchbook = " \
-                              file://name.patch;apply=yes \
-                              file://screen-off.patch;apply=yes \
+                              file://name.patch \
+                              file://screen-off.patch \
                              "
 
 
 SRC_URI_append_am3517-evm = " \
-                                 file://xload-shiva.diff;apply=yes \
+                                 file://xload-shiva.diff \
 "
 
 SRC_URI_omapzoom2 = "git://dev.omapzoom.org/pub/scm/bootloader/x-loader.git;protocol=git \
diff --git a/recipes/xaos/xaos_3.2.3.bb b/recipes/xaos/xaos_3.2.3.bb
index ff15a64..8217c62 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;apply=yes \
-           file://fix-aalib-configure.patch;apply=yes"
+           file://fix-build.patch \
+           file://fix-aalib-configure.patch"
 
 S = "${WORKDIR}/XaoS-${PV}"
 
diff --git a/recipes/xautomation/xautomation.inc b/recipes/xautomation/xautomation.inc
index 9684b7c..fdd9b9f 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;apply=yes"
+           file://remove-man.patch"
 
 inherit autotools pkgconfig
diff --git a/recipes/xawtv/xawtv_3.93.bb b/recipes/xawtv/xawtv_3.93.bb
index 27bf9dc..f61a2b4 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;apply=yes"
+	   file://make.patch"
 S = "${WORKDIR}/xawtv-${PV}"
 
 inherit autotools
diff --git a/recipes/xboard/xboard_4.4.1.bb b/recipes/xboard/xboard_4.4.1.bb
index 5407e65..f245b8e 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;apply=yes;striplevel=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 322f0df..3676b3c 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;apply=yes;striplevel=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/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb b/recipes/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
index 41cdc20..ef746a8 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;apply=yes \
-	   file://fix_watch_cursor.patch;apply=yes"
+	   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 930c166..512c5fe 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;apply=yes \
-	   file://skip_watch_cursor.patch;apply=yes \
+	   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 5c320b6..5a1edf8 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;apply=yes "
+           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 2fe277e..e9f4ba4 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;apply=yes \
+           file://running_from_menu.patch \
            file://xdiskusage.desktop \
            file://xdiskusage.png"
 
diff --git a/recipes/xfce-base/exo_0.3.105.bb b/recipes/xfce-base/exo_0.3.105.bb
index b21932b..eedbe10 100644
--- a/recipes/xfce-base/exo_0.3.105.bb
+++ b/recipes/xfce-base/exo_0.3.105.bb
@@ -8,9 +8,9 @@ inherit xfce46 python-dir
 XFCE_VERSION = "4.6.1"
 
 SRC_URI += " \
-    file://exo-0.3.105-iocharset.patch;apply=yes \
-    file://exo-no-tests.patch;apply=yes \
-    file://configure.patch;apply=yes \
+    file://exo-0.3.105-iocharset.patch \
+    file://exo-no-tests.patch \
+    file://configure.patch \
 "
 
 # Note: Python checking is broken
diff --git a/recipes/xfce-base/exo_0.3.4.bb b/recipes/xfce-base/exo_0.3.4.bb
index 40549d9..f48c9bb 100644
--- a/recipes/xfce-base/exo_0.3.4.bb
+++ b/recipes/xfce-base/exo_0.3.4.bb
@@ -5,8 +5,8 @@ PR = "r1"
 inherit xfce
 XFCE_VERSION = 4.4.2
 
-SRC_URI += " file://configure.patch;apply=yes"
-SRC_URI += " file://exo-no-tests.patch;apply=yes"
+SRC_URI += " file://configure.patch"
+SRC_URI += " file://exo-no-tests.patch"
 
 # Note: Python checking is broken
 do_configure_prepend() {
diff --git a/recipes/xfce-base/xfce-terminal_0.2.8.bb b/recipes/xfce-base/xfce-terminal_0.2.8.bb
index 1e32f64..1a23241 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;apply=yes"
+           file://into-support.patch"
 
 S = "${WORKDIR}/Terminal-${PV}"
 
diff --git a/recipes/xfce-base/xfce4-settings_4.6.1.bb b/recipes/xfce-base/xfce4-settings_4.6.1.bb
index 87442ea..7ac82cf 100644
--- a/recipes/xfce-base/xfce4-settings_4.6.1.bb
+++ b/recipes/xfce-base/xfce4-settings_4.6.1.bb
@@ -11,8 +11,8 @@ PR = "r2"
 inherit xfce46
 
 SRC_URI += " \
-    file://xfce4-settings-4.6.1-libxklavier.patch;apply=yes \
-    file://xfce4-settings-4.6.1-configure.patch;apply=yes \
+    file://xfce4-settings-4.6.1-libxklavier.patch \
+    file://xfce4-settings-4.6.1-configure.patch \
 "
 
 SRC_URI[md5sum] = "dc1c8704471c5b0104fa10c30eb60cb6"
diff --git a/recipes/xfce-base/xfce4-settings_4.6.4.bb b/recipes/xfce-base/xfce4-settings_4.6.4.bb
index 646b845..1210988 100644
--- a/recipes/xfce-base/xfce4-settings_4.6.4.bb
+++ b/recipes/xfce-base/xfce4-settings_4.6.4.bb
@@ -7,7 +7,7 @@ DEPENDS = "virtual/libx11 virtual/xserver libxi libwnck xrandr exo libxfce4util"
 
 inherit xfce46
 
-SRC_URI += "file://0001-Port-to-libxklavier-5.0-API.patch;apply=yes" 
+SRC_URI += "file://0001-Port-to-libxklavier-5.0-API.patch" 
 
 SRC_URI[archive.md5sum] = "04985407e8e5b916c44780314a177e96"
 SRC_URI[archive.sha256sum] = "a5e3f0d959b0d424355414769250473785043c3977446a73b36fa3a5ce44ecdb"
diff --git a/recipes/xfce-base/xfdesktop_4.4.2.bb b/recipes/xfce-base/xfdesktop_4.4.2.bb
index caab519..201f2e3 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;apply=yes \
-             file://fix-segfault-when-removable-icons-are-disabled.patch;apply=yes"
+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 3f41467..4baaac8 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;apply=yes \
+	  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 4c37f0f..0e2c435 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;apply=yes"
+           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 0bbf561..309d7d8 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;apply=yes \
-	   file://fix-equalsign.patch;apply=yes \
-	   file://fix-circumkey.patch;apply=yes \
-	   file://add-default-common-slides.patch;apply=yes \
-	   file://differentiate-desktop-name.patch;apply=yes \
+           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 7f4836a..fb7f5fc 100644
--- a/recipes/xkeyboard-config/xkeyboard-config_1.4.bb
+++ b/recipes/xkeyboard-config/xkeyboard-config_1.4.bb
@@ -5,7 +5,7 @@ RDEPENDS = "xkbcomp"
 PR = "r4"
 
 SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2 \
-           file://abnt2-fixes.patch;apply=yes"
+           file://abnt2-fixes.patch"
 
 inherit autotools
 
diff --git a/recipes/xml-commons/dom4j_1.6.1.bb b/recipes/xml-commons/dom4j_1.6.1.bb
index e9672be..94bd807 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;apply=yes \
+	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 d8abf29..697e01d 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;apply=yes \
+	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 1a05c7a..11b6453 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;apply=yes \
+    file://makefile.patch \
     "
 
 do_compile() {
diff --git a/recipes/xmltv/xmltv_0.5.56.bb b/recipes/xmltv/xmltv_0.5.56.bb
index c1eaac0..dc55bb7 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;apply=yes"
+         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 7d35522..baffdb8 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;apply=yes \
-           file://gtkremoval.patch;apply=yes \
-           file://removenativeincdir.patch;apply=yes \
-           file://glib2.patch;apply=yes \
-           file://tremorlib.patch;apply=yes \
-           file://bufferdefaults.patch;apply=yes \
-           file://gcc34.patch;apply=yes \
-           file://gcc34-enum.patch;apply=yes \
-           file://mikmod-endian.patch;apply=yes \
-           file://mikmod-update.patch;apply=yes \
+           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 59c1d48..c0a9a31 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;apply=yes \
-           file://xmms-config-dequote.patch;apply=yes \
+           file://gcc4.patch \
+           file://xmms-config-dequote.patch \
 	   file://acinclude.m4 \
            file://xmms.sh"
 PR = "r5"
diff --git a/recipes/xorg-app/xdpyinfo_1.0.2.bb b/recipes/xorg-app/xdpyinfo_1.0.2.bb
index 83de8d4..60cb11b 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;apply=yes"
+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 f9a70d0..c515c77 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;apply=yes"
+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 fe210dc..d9641b2 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;apply=yes"
+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 10076fe..8c22a14 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;apply=yes"
+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 aee7e33..cb6e7cd 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;apply=yes"
+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 21e0bf1..4823517 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;apply=yes"
+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 02f0686..bac668e 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;apply=yes"
+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 bd4319f..a972f55 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;apply=yes"
+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 175b230..0c937c6 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;apply=yes"
+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 a8c7fe8..19dbaa9 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;apply=yes"
+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 060187e..303489f 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;apply=yes"
+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 0fd7a71..ac6e5bb 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;apply=yes"
+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 814c1e1..e568597 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;apply=yes"
+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 1f1014b..e025998 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;apply=yes \
-           file://02_calibration_1.6.patch;apply=yes \
-           file://03_server-1.6-ftbfs.diff;apply=yes \
-           file://04_server-1.7-ftbfs.diff;apply=yes \
+           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 9669d21..693c703 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;apply=yes \
-           file://01_fix-wrong-value-range-for-the-axises.diff;apply=yes \
-           file://dynamic-xy.patch;apply=yes \
-           file://xserver16.patch;apply=yes \
+           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 83f7fda..2e8afac 100644
--- a/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb
+++ b/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb
@@ -7,9 +7,9 @@ DEPENDS += "tslib"
 PR = "r12"
 
 SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2;name=archive \
-           file://double-free-crash.patch;apply=yes \
+           file://double-free-crash.patch \
            file://10-x11-input-tslib.fdi \
-           file://xserver-174-XGetPointerControl.patch;apply=yes \
+           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 1a88ba7..58570c0 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;apply=yes"
+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 8cb52c9..c352dd0 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;apply=yes"
+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 e19230c..e078ce4 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;apply=yes"
+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 bac25ba..2261ec0 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;apply=yes"
+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 5b95142..aa29c4d 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;apply=yes \
+           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 c9f1fb9..e221e73 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;apply=yes"
+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 ff9c92f..ce13df2 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;apply=yes"
+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 1b76971..e64174c 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;apply=yes"
+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 7823f95..39c3edb 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;apply=yes"
+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 913a404..8e66ca8 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;apply=yes"
+SRC_URI += "file://fixes.patch"
 SRC_URI[archive.md5sum] = "05f85d897ef41d13de354ac0252bf923"
 SRC_URI[archive.sha256sum] = "d739f6762fe3aa7ef7ca74f87fbe4d6ec3bb13a735e5dfb82b6748eda2b31138"
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 8a6bf0c..e79e113 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;apply=yes "
+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 7fbbde6..594e421 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;apply=yes \
+           file://compile_cfbbd17f0d4ab0f30915594d74e1b2b12c4ff8a1.patch \
            file://kgsl_drm.h "
 
-SRC_URI_append_htcdream = "file://no_neon_cfbbd17f0d4ab0f30915594d74e1b2b12c4ff8a1.patch;apply=yes"
+SRC_URI_append_htcdream = "file://no_neon_cfbbd17f0d4ab0f30915594d74e1b2b12c4ff8a1.patch"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/xorg-driver/xf86-video-s3c64xx_git.bb b/recipes/xorg-driver/xf86-video-s3c64xx_git.bb
index 1a10357..d1cbb83 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;apply=yes \
-           file://0002-DPMS-header-was-split-into-dpms.h-client-and-dpmscon.patch;apply=yes \
-           file://0003-s3c64xx-lcd-include-cursorstr.h-to-get-CursorRec-and.patch;apply=yes \
+           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 e0ab37b..3c67e1c 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;apply=yes"
+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 040b174..b1f62f3 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;apply=yes \
-            file://fix-configure-includes.patch;apply=yes"
+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 f2613c2..b5ffdfe 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;apply=yes \
-            file://fix-configure-includes.patch;apply=yes"
+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 af1aed9..b01a810 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;apply=yes \
-            file://fix-configure-includes.patch;apply=yes"
+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 1d4ebfd..43bfa95 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;apply=yes"
+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 83b61c5..08620f1 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;apply=yes"
+	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 a0d9152..486faf0 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;apply=yes \
-	    file://fix-disable-xlocale.diff;apply=yes \
-            file://fix-utf8-wrong-define.patch;apply=yes \
-	    file://xim.patch;apply=yes \
-	    file://xchar2b.patch;apply=yes"
+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 d31c6b8..0d8dbd5 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;apply=yes \
-	    file://fix-disable-xlocale.diff;apply=yes \
-            file://fix-utf8-wrong-define.patch;apply=yes"
+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 40e0519..149d543 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;apply=yes \
-	    file://fix-disable-xlocale.diff;apply=yes \
-            file://fix-utf8-wrong-define.patch;apply=yes"
+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 678226f..516ca03 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;apply=yes \
-            file://fix-disable-xlocale.diff;apply=yes \
-            file://fix-utf8-wrong-define.patch;apply=yes"
+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 59fa0b7..4f7e51b 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;apply=yes \
-            file://fix-disable-xlocale.diff;apply=yes \
-            file://fix-utf8-wrong-define.patch;apply=yes"
+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/liblbxutil_1.0.1.bb b/recipes/xorg-lib/liblbxutil_1.0.1.bb
index 954b9c4..fc6e612 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;apply=yes"
+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 dd6e3d9..a00f15f 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;apply=yes"
+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 df6eff0..8263971 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;apply=yes"
+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 178fe87..f7c40e2 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;apply=yes "
+#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;apply=yes \
-            file://makekeys-update.patch;apply=yes"
+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 1ffd3dc..0ecf6cd 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;apply=yes"
+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 ad1e6da..a02fb0e 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;apply=yes" 
+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 2507ba8..8100baa 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;apply=yes" 
+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 1b3c0d9..6949a3f 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;apply=yes \
-            file://include_fix.patch;apply=yes" 
+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 bffa18a..fa33157 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;apply=yes \
-            file://keysymdef_include.patch;apply=yes"
+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 2a6730f..b496563 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;apply=yes \
-            file://keysymdef_include.patch;apply=yes"
+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 2d1c123..855dfa2 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;apply=yes \
-            file://dolt-fix.patch;apply=yes \
-            file://keysymdef_include.patch;apply=yes"
+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 f20d7be..37ef559 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;apply=yes \
-            file://dolt-fix.patch;apply=yes \
-            ${@['file://keysymdef_include.patch;apply=yes', ''][(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 c686f27..928e805 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;apply=yes"
+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 fab4d87..e6feafd 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;apply=yes"
+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 8edded8..c6cbff8 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;apply=yes"
+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 a721c86..9d98479 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;apply=yes"
+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 647cbe4..6f63f7b 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;apply=yes \
-            file://builtinreaddirectory-no-side-effect.patch;apply=yes"
+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 476ccef..a6be89f 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;apply=yes"
+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 69d42f5..5c9f08b 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;apply=yes"
+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 c6c9052..17cf158 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;apply=yes"
+#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 7467420..4ec9e23 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;apply=yes"
+#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 a6df027..bb8be59 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;apply=yes"
+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 0d2668e..4038a17 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;apply=yes"
+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 68e7160..f002b73 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;apply=yes"
+SRC_URI += "file://pr10970-header-fix.patch"
 
 EXTRA_OECONF += "--disable-install-makestrs --disable-xkb"
 
diff --git a/recipes/xorg-lib/pixman_0.11.8.bb b/recipes/xorg-lib/pixman_0.11.8.bb
index 4879773..1a507ae 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;apply=yes \
-	   file://pixman-x888-565.patch;apply=yes \
+           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 939da91..cb9bfc2 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;apply=yes \
-	   file://pixman-x888-565.patch;apply=yes \
+           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 78e50db..a35b452 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;apply=yes \
+            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 e39659d..cad36e6 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;apply=yes \
-           file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch;apply=yes \
-           file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch;apply=yes \
-           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch;apply=yes \
-           file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch;apply=yes \
-           file://0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch;apply=yes \ 
-           file://over-n-8-0565.patch;apply=yes \
-           file://src-8888-0565.patch;apply=yes \
+           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 4e1e1fd..8613e99 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;apply=yes \
-           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch;apply=yes \
-           file://0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch;apply=yes \
-           file://0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch;apply=yes \
-           file://1-composite.patch;apply=yes \
-           file://2-composite.patch;apply=yes \          
-           file://3-composite.patch;apply=yes \          
+           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 2140609..ce44da4 100644
--- a/recipes/xorg-lib/pixman_0.18.0.bb
+++ b/recipes/xorg-lib/pixman_0.18.0.bb
@@ -5,15 +5,15 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_shr = "2"
  
 SRC_URI += "\
-           file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch;apply=yes \
-           file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch;apply=yes \
-           file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch;apply=yes \
-           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch;apply=yes \
-           file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch;apply=yes \
-           file://calloc.patch;apply=yes \
-           file://tls.patch;apply=yes \
-           file://565-scanline.patch;apply=yes \
-           file://missing-cache-preload.diff;apply=yes \
+           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
index 067c7b3..d070840 100644
--- a/recipes/xorg-lib/pixman_0.18.2.bb
+++ b/recipes/xorg-lib/pixman_0.18.2.bb
@@ -8,13 +8,13 @@ SRC_URI[archive.md5sum] = "5d1378fa61610dd5d3c7e0111b2c5253"
 SRC_URI[archive.sha256sum] = "80aee833b429d105d2c7593ef96993da04441b3b747084f1f3bfd7be594e1c45"
  
 SRC_URI += "\
-           file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch;apply=yes\
-           file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch;apply=yes\
-           file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch;apply=yes\
-           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch;apply=yes\
-           file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch;apply=yes\
-           file://0006-A-copy-paste-version-of-16bpp-bilinear-scanline-fetc.patch;apply=yes\
-           file://0007-ARM-added-missing-cache-preload.patch;apply=yes\
+           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 "
diff --git a/recipes/xorg-lib/pixman_0.9.5.bb b/recipes/xorg-lib/pixman_0.9.5.bb
index 122d9d7..e538113 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;apply=yes"
+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 a34a8d6..160819a 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;apply=yes \
-           file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch;apply=yes \
-           file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch;apply=yes \
-           file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch;apply=yes \
-           file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch;apply=yes \
-           file://0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch;apply=yes \ 
-           file://over-n-8-0565.patch;apply=yes \
-           file://src-8888-0565.patch;apply=yes \
-           file://calloc.patch;apply=yes \
-           file://tls.patch;apply=yes \
+           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/xtrans_1.0.3.bb b/recipes/xorg-lib/xtrans_1.0.3.bb
index bb4c0bd..30c3d03 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;apply=yes"
+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 eb2ea7a..de826bb 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;apply=yes"
+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 da10543..0ec225f 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;apply=yes"
+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 14c547f..b5d56ac 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;apply=yes"
+SRC_URI += "file://fix-missing-includepath.patch"
 
 SRC_URI[archive.md5sum] = "a91fef8b932b21992af7dfff7b2643f3"
 SRC_URI[archive.sha256sum] = "d6c3cabd5ecd0183a8a9bc6b3471545df8e2c78956b4c4cfd48f0c545a88c9a4"
diff --git a/recipes/xorg-util/util-macros_1.1.5.bb b/recipes/xorg-util/util-macros_1.1.5.bb
index cde725c..bd580ad 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;apply=yes"
+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 ebcf93b..9c37f50 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;apply=yes"
+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 8ce23f8..7d9e608 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;apply=yes"
+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/xserver-kdrive-common.inc b/recipes/xorg-xserver/xserver-kdrive-common.inc
index aad7df8..6272a3a 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;apply=yes \
-	file://kmode-800_480.patch;apply=yes \
-	file://disable-apm.patch;apply=yes \
-	file://no-serial-probing.patch;apply=yes \
-	file://fbdev-not-fix.patch;apply=yes  \
-	file://optional-xkb.patch;apply=yes \
-	file://enable-tslib.patch;apply=yes \
-	file://kmode-palm.patch;apply=yes \
+	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;apply=yes"
-SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;apply=yes"
-SRC_URI_append_qemux86 = " file://xserver-kdrive-poodle.patch;apply=yes"
+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 0c4c73e..080c6e2 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;apply=yes  \
-	file://kdrive-use-evdev.patch;apply=yes  \
-	file://disable-xf86-dga-xorgcfg.patch;apply=yes \
-	file://enable-xcalibrate.patch;apply=yes \
-        file://fbcompositesrc8888revnpx0565.patch;apply=yes \
-        file://kdrive-vidmemarea.patch;apply=yes \
-        file://kdrive-imageon.patch;apply=yes \
-        file://xcalibrate_coords.patch;apply=yes \
-        file://enable-builtin-fonts.patch;apply=yes \
-	file://fix-picturestr-include-order.patch;apply=yes \
-	file://split_multiple_AC_SUBST.patch;apply=yes \
-	file://report-correct-randr10.patch;apply=yes \
+	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 079e4d2..490f18a 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;apply=yes \
-        file://nomadik_xserver_sva_service_cleanup.patch;apply=yes \
-        file://autotools.patch;apply=yes \
-        file://fix-picturestr-include-order.patch;apply=yes" 
+        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 e964720..8f69d4b 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;apply=yes \
-	file://disable-apm.patch;apply=yes \
-	file://no-serial-probing.patch;apply=yes \
-	file://fbdev-not-fix.patch;apply=yes  \
-	file://enable-builtin-fonts.patch;apply=yes \
-	file://xcalibrate.patch;apply=yes \
-	file://fixups.patch;apply=yes \
-	file://button_only.patch;apply=yes \
-	file://calibrateext.patch;apply=yes \
-        file://fix-picturestr-include-order.patch;apply=yes \
-	file://xcalibrate_coords.patch;apply=yes \
-	file://report-correct-randr10.patch;apply=yes"
-#	file://kdrive-evdev.patch;apply=yes  \
-#	file://kdrive-use-evdev.patch;apply=yes  \
-#	file://optional-xkb.patch;apply=yes \
-#	file://disable-xf86-dga-xorgcfg.patch;apply=yes \
-#	file://enable-tslib.patch;apply=yes \
-#	file://xfbdev-fb-opt.patch;apply=yes"
+	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 549693e..df63782 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;apply=yes \
-	file://disable-apm.patch;apply=yes \
-	file://no-serial-probing.patch;apply=yes \
-	file://kdrive-evdev.patch;apply=yes  \
-	file://kdrive-use-evdev.patch;apply=yes  \
-	file://fbdev-not-fix.patch;apply=yes  \
-	file://enable-builtin-fonts.patch;apply=yes \
-	file://optional-xkb.patch;apply=yes \
-	file://disable-xf86-dga-xorgcfg.patch;apply=yes \
-	file://enable-tslib.patch;apply=yes \
-	file://xcalibrate.patch;apply=yes \
-	file://xfbdev-fb-opt.patch;apply=yes \
-	file://hide-cursor-and-ppm-root.patch;apply=yes \
-	file://report-correct-randr10.patch;apply=yes"
+	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;apply=yes"
-SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;apply=yes"
-SRC_URI_append_qemux86 = " file://xserver-kdrive-poodle.patch;apply=yes"
+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 4d7e2a7..167c8e9 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;apply=yes \
-	file://enable-builtin-fonts.patch;apply=yes \
-	file://kdrive-evdev.patch;apply=yes  \
-	file://kdrive-use-evdev.patch;apply=yes  \
-	file://disable-xf86-dga-xorgcfg.patch;apply=yes \
-	file://enable-xcalibrate.patch;apply=yes \
-        file://w100.patch;apply=yes \
-        file://w100-autofoo.patch;apply=yes \
-        file://w100-fix-offscreen-bmp.patch;apply=yes \
-        file://fbcompositesrc8888revnpx0565.patch;apply=yes \
-        file://xcalibrate_coords.patch;apply=yes \
-	file://report-correct-randr10.patch;apply=yes \
+	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 a98d5c5..ce5a3fc 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;apply=yes \
-	file://enable-builtin-fonts.patch;apply=yes \
-	file://kdrive-evdev.patch;apply=yes  \
-	file://kdrive-use-evdev.patch;apply=yes  \
-	file://disable-xf86-dga-xorgcfg.patch;apply=yes \
-        file://fix_default_mode.patch;apply=yes \
-	file://enable-xcalibrate.patch;apply=yes \
-	file://hide-cursor-and-ppm-root.patch;apply=yes \
-	file://xcalibrate_coords.patch;apply=yes \
-	file://w100.patch;apply=yes \
-	file://w100-autofoo.patch;apply=yes \
-	file://w100-fix-offscreen-bmp.patch;apply=yes \
-        file://kdrive-1.3-18bpp.patch;apply=yes \
-        file://linux-keyboard-mediumraw.patch;apply=yes \
-        file://gumstix-kmode.patch;apply=yes \
-        file://fix-picturestr-include-order.patch;apply=yes \
-        file://autotools.patch;apply=yes \
-	file://report-correct-randr12.patch;apply=yes \
+	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;apply=yes \
+        file://xorg-avr32-support.diff \
 "
 
-SRC_URI_append_tosa = "file://tosa-fbdev.patch;apply=yes"
+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 ae46c80..42a48ce 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;apply=yes \
-        file://fix_default_mode.patch;apply=yes \
-	file://enable-xcalibrate.patch;apply=yes \
-	file://hide-cursor-and-ppm-root.patch;apply=yes \
-	file://xcalibrate_coords.patch;apply=yes \
-	file://w100.patch;apply=yes \
-	file://w100-autofoo.patch;apply=yes \
-	file://w100-fix-offscreen-bmp.patch;apply=yes \
-	file://w100-new-input-world-order.patch;apply=yes \
-	file://linux-keyboard-mediumraw.patch;apply=yes \
-	file://xcalibrate-new-input-world-order.patch;apply=yes \
-	file://tslib-default-device.patch;apply=yes \
-	file://fbdev-evdev.patch;apply=yes \
-	file://keyboard-resume-workaround.patch;apply=yes \
-	file://xorg-avr32-support.diff;apply=yes \
-	file://pkgconfig_fix.patch;apply=yes \
-        file://no_xkb.patch;apply=yes;striplevel=0 \
-	file://xorg-1.4-kdrive-rotation.patch;apply=yes \
-	file://split_multiple_AC_SUBST.patch;apply=yes \
-	file://vm86_masks.patch;apply=yes \
+	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 0c45908..1c63866 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;apply=yes \
-        file://fix_default_mode.patch;apply=yes \
-	file://enable-xcalibrate.patch;apply=yes \
-	file://hide-cursor-and-ppm-root.patch;apply=yes \
-	file://xcalibrate_coords.patch;apply=yes \
-	file://w100.patch;apply=yes \
-	file://w100-autofoo.patch;apply=yes \
-	file://w100-fix-offscreen-bmp.patch;apply=yes \
-	file://w100-new-input-world-order.patch;apply=yes \
-	file://linux-keyboard-mediumraw.patch;apply=yes \
-	file://xcalibrate-new-input-world-order.patch;apply=yes \
-	file://tslib-default-device.patch;apply=yes \
-	file://fbdev-evdev.patch;apply=yes \
-	file://keyboard-resume-workaround.patch;apply=yes \
-	file://xorg-avr32-support.diff;apply=yes \
-	file://pkgconfig_fix.patch;apply=yes \
-        file://no_xkb.patch;apply=yes;striplevel=0 \
-	file://vm86_masks.patch;apply=yes \
+	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 d35fb71..483133e 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;apply=yes \
-        file://fix_default_mode.patch;apply=yes \
-#	file://hide-cursor-and-ppm-root.patch;apply=yes \
-#	file://xcalibrate_coords.patch;apply=yes \
-	file://w100.patch;apply=yes \
-	file://w100-autofoo.patch;apply=yes \
-	file://w100-fix-offscreen-bmp.patch;apply=yes \
-	file://w100-new-input-world-order.patch;apply=yes \
-	file://linux-keyboard-mediumraw.patch;apply=yes \
-	file://xcalibrate-new-input-world-order.patch;apply=yes \
-	file://tslib-default-device.patch;apply=yes \
-#	file://fbdev-evdev.patch;apply=yes \
-	file://keyboard-resume-workaround.patch;apply=yes \
-	file://xorg-avr32-support.diff;apply=yes \
-#	file://pkgconfig_fix.patch;apply=yes \
-	file://no_xkb.patch;apply=yes;striplevel=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 648b0a3..a00160a 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;apply=yes \
-        file://fix_default_mode.patch;apply=yes \
-	file://enable-xcalibrate.patch;apply=yes \
-	file://hide-cursor-and-ppm-root.patch;apply=yes \
-	file://xcalibrate_coords.patch;apply=yes \
-	file://w100.patch;apply=yes \
-	file://w100-autofoo.patch;apply=yes \
-	file://w100-fix-offscreen-bmp.patch;apply=yes \
-	file://w100-new-input-world-order.patch;apply=yes \
-	file://linux-keyboard-mediumraw.patch;apply=yes \
-	file://xcalibrate-new-input-world-order.patch;apply=yes \
-	file://tslib-default-device.patch;apply=yes \
-	file://fbdev-evdev.patch;apply=yes \
-	file://keyboard-resume-workaround.patch;apply=yes \
-	file://xorg-avr32-support.diff;apply=yes \
-	file://pkgconfig_fix.patch;apply=yes \
+	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 39fed5c..f1430fc 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;apply=yes \
-        file://fix_default_mode.patch;apply=yes \
-	file://linux-keyboard-mediumraw.patch;apply=yes \
-	file://xcalibrate-new-input-world-order.patch;apply=yes \
-	file://tslib-default-device.patch;apply=yes \
-	file://keyboard-resume-workaround.patch;apply=yes \
-	file://xorg-avr32-support.diff;apply=yes \
-    file://sysroot_fix.patch;apply=yes \
-    file://drmfix.patch;apply=yes \
+	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 eed96a3..8802d9c 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;apply=yes \
-	file://fix_default_mode.patch;apply=yes \
-	file://enable-xcalibrate.patch;apply=yes \
-	file://hide-cursor-and-ppm-root.patch;apply=yes \
-	file://xcalibrate_coords.patch;apply=yes \
-	file://w100.patch;apply=yes \
-	file://w100-autofoo.patch;apply=yes \
-	file://w100-fix-offscreen-bmp.patch;apply=yes \
-	file://w100-new-input-world-order.patch;apply=yes \
-	file://w100-post-1.4-buildfix.patch;apply=yes \
-	file://xcalibrate-new-input-world-order.patch;apply=yes \
-	file://tslib-default-device.patch;apply=yes \
-	file://fbdev-evdev.patch;apply=yes \
-	file://xephyr-post-1.4-buildfix.patch;apply=yes \
+	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.2.0.bb b/recipes/xorg-xserver/xserver-xorg_1.2.0.bb
index f0f82bf..0b2e399 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;apply=yes"
+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 2a78168..c2ec4b1 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;apply=yes \
-            file://glyphstr.patch;apply=yes \
-            file://report-correct-randr12.patch;apply=yes"
+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 c1b8530..692c6c3 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;apply=yes \
-            file://pkgconfig_fix.patch;apply=yes \
-            file://sysroot_fix.patch;apply=yes \
+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 0203996..fcddb1d 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;apply=yes \
-            file://pkgconfig_fix.patch;apply=yes \
-            file://sysroot_fix.patch;apply=yes"
+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 be9dcb5..a1af8c3 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;apply=yes \
-            file://sysroot_fix.patch;apply=yes"
+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 925ceca..502ad6d 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;apply=yes \
-            file://sysroot_fix.patch;apply=yes \
-            file://xorg-avr32-support.diff;apply=yes \
-	    file://xorg-server-1.5.3-configure.patch;apply=yes \
-	    file://xorg-server-1.5.3-glcore-prepare-for-dynamic.patch;apply=yes \
+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 0be0cda..d8020cf 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;apply=yes \
-            file://dolt-fix-1.7.0.patch;apply=yes \
-            file://randr-support-1.7.0.patch;apply=yes \
+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 e90d84c..8dbf5f8 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;apply=yes \
-            file://dolt-fix-1.7.0.patch;apply=yes \
-            file://randr-support-1.7.0.patch;apply=yes \
-	    file://hack-fbdev-ignore-return-mode.patch;apply=yes \
+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;apply=yes"
-SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch;apply=yes"
+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 6a1a4ec..14d3523 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.8.0.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.8.0.bb
@@ -13,15 +13,15 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_shr = "1"
 
 SRC_URI += " \
-            file://dolt-fix-1.7.0.patch;apply=yes \
-            file://randr-support-1.7.0.patch;apply=yes \
-	    file://hack-fbdev-ignore-return-mode.patch;apply=yes \
+            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;apply=yes"
-SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch;apply=yes"
+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
index 72fb845..b1e6257 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.8.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.8.1.bb
@@ -13,15 +13,15 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_shr = "1"
 
 SRC_URI += " \
-            file://dolt-fix-1.7.0.patch;apply=yes \
-            file://randr-support-1.7.0.patch;apply=yes \
-	    file://hack-fbdev-ignore-return-mode.patch;apply=yes \
+            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;apply=yes"
-SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch;apply=yes"
+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_cvs.bb b/recipes/xorg-xserver/xserver-xorg_cvs.bb
index 8b115a1..ef081d9 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;apply=yes \
-	file://dri.patch;apply=yes"
+	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 12a895f..a0b5f7d 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;apply=yes \
-           file://randr-support-1.7.0.patch;apply=yes \
-	   file://hack-fbdev-ignore-return-mode.patch;apply=yes \
+           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 6d567b5..fe75f21 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;apply=yes"
+	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 72438e4..a6f8b67 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;apply=yes \
-	   file://moc_call.patch;apply=yes "
+	   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 9e0fe66..7634d27 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;apply=yes \
-        file://moc_call.patch;apply=yes \
-        file://imake-staging.patch;apply=yes \
-        file://cross.patch;apply=yes \
-        file://fephack.patch;apply=yes \
-        file://xchar2b.patch;apply=yes \
-        file://xqt-make.patch;apply=yes \ 
-        file://fix_qtscreen_HACK.patch;apply=yes \
-	file://fix_seqfault_qtscreen.patch;apply=yes "
+        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 2922142..2e95adb 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;apply=yes \
-           file://configure.patch;apply=yes \
+           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 fbb0817..367cf97 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;apply=yes \
-           file://configure.in.patch;apply=yes \
-	   file://configure.in-includedir.patch;apply=yes \
+           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 2d32cb5..6a391e3 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;apply=yes \
-           file://glfix.patch;apply=yes \
-           file://dpms-header.patch;apply=yes \
+           file://configure.in.patch \
+           file://glfix.patch \
+           file://dpms-header.patch \
            file://XScreenSaver"
 
 
diff --git a/recipes/xserver-common/xserver-common_1.11.bb b/recipes/xserver-common/xserver-common_1.11.bb
index c250800..c372712 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;apply=yes \
-		   file://w100.patch;apply=yes \
-		   file://poodle-xmodmap-2.6.patch;apply=yes"
+		   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 3b8545e..b2661a6 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;apply=yes"
+	           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 4882300..a894124 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;apply=yes \
-                   file://calibrate-only-if-ts.patch;apply=yes"
+                   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 b6e1a99..c55bb29 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;apply=yes \
-                   file://calibrate-only-if-ts.patch;apply=yes"
+                   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 a82aeda..c420049 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;apply=yes \
-                   file://calibrate-only-if-ts.patch;apply=yes"
+                   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 eae4aed..8d229a5 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;apply=yes \
-                   file://calibrate-only-if-ts.patch;apply=yes \
-		   file://softkeys-c7x0.patch;apply=yes \
-		   file://load-xmodmap-k26.patch;apply=yes \
-		   file://Xserver-udev-input-helper.patch;apply=yes \
-		   file://sl-cxx00-modmap.patch;apply=yes \
+                   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 4b8cd0a..df6c05d 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;apply=yes file://unbreak-simpad.patch;patch=1 file://setDPI.sh "
+SRC_URI_append = " file://ti-osk.patch file://unbreak-simpad.patch;patch=1 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 d026989..160a3fd 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;apply=yes \
-                            file://xorg-fixes.patch;apply=yes \
-			    file://gta-xorg-fixes.patch;apply=yes \
+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 a770729..ad7824c 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;apply=yes \
-                   file://ts-handling-cleanup.diff;apply=yes \
-                   file://Xserver-at91.patch;apply=yes \
+                   file://avoid-rotated-server.patch \
+                   file://ts-handling-cleanup.diff \
+                   file://Xserver-at91.patch \
 "
 
-SRC_URI_append_angstrom = " file://xtscal-fix.patch;apply=yes "
+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 dbcfa33..a4390ab 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;apply=yes \
-file://0019-keymap-fixed-machine-names.patch;apply=yes \
-file://0020-keymap-fixed-machine-names-again.patch;apply=yes \
-file://0021-xserver-introduced-MOUSE-variable-for-mouse-argument.patch;apply=yes \
-file://0022-xserver-fix-syntax-error.patch;apply=yes \
-file://0023-Xserver-provide-screen-argument-only-for-non-X.org-s.patch;apply=yes \
-file://0024-Xserver-move-nearly-whole-functionality-to-xserver-c.patch;apply=yes \
-file://0025-Makefile-move-modmaps-install-xserver-common.patch;apply=yes \
-file://0026-98keymap-fixup-fixed-path-to-xmodmap-file.patch;apply=yes \
+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 7cbd52b..a0f7709 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;apply=yes "
+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
index dc35c0c..f1fcfc3 100644
--- a/recipes/xserver-common/xserver-common_1.33.bb
+++ b/recipes/xserver-common/xserver-common_1.33.bb
@@ -16,19 +16,19 @@ inherit gpe
 SRC_URI[md5sum] = "2df46d6b1bbac9f3e5e7e3191ccdd3e4"
 SRC_URI[sha256sum] = "4576ccca80730f1860a273df38b9f917cf906eca9865e108d76fc5460e006d87"
 
-SRC_URI_append = " file://loop.patch;apply=yes;striplevel=3 \
-                   file://rgba.diff;apply=yes \
+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;apply=yes "
+SRC_URI_append_angstrom = " file://xtscal-fix.patch "
 RDEPENDS_${PN}_append_angstrom = " tslib-calibrate "
 
-SRC_URI_append_shr = " file://89xTs_Calibrate.xinput_calibrator.patch;apply=yes \
-                       file://90xXWindowManager.patch;apply=yes \
-                       file://Xserver.add.nocursor.for.gta.patch;apply=yes \
-                       file://Xserver.add.xserver-system.patch;apply=yes \
-                       file://Xserver.add.dpi.for.gta.patch;apply=yes"
+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"
diff --git a/recipes/xserver-common/xserver-common_svn.bb b/recipes/xserver-common/xserver-common_svn.bb
index 558baa2..f664cb9 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;apply=yes \
-	    file://keyboardless-buttonmap.patch;apply=yes \	   
-	    file://softkeys-c7x0.patch;apply=yes \
- 	    file://sl-cxx00-modmap.patch;apply=yes \
-	    file://load-xmodmap-k26.patch;apply=yes \
-	    file://Xserver-udev-input-helper.patch;apply=yes"
+	    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/xst/xst_0.15.bb b/recipes/xst/xst_0.15.bb
index c5958bf..310d73b 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;apply=yes"
+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 8d0af34..cd95d3d 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;apply=yes;striplevel=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 14efe08..36b64a8 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;apply=yes"
+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 d49b771..01aa007 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;apply=yes \
-	   file://cleanup.patch;apply=yes"
+           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 e225c8b..bb97490 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;apply=yes"
+           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 aff4735..e0a97fd 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;apply=yes \
-	   file://yasr-0.6.9-remove-m4.patch;apply=yes \
+	   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 0772b55..a74dabf 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;apply=yes \
-           file://pathfix.patch;apply=yes "
+           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 69babdd..a9af687 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;apply=yes \
-           file://paths.patch;apply=yes \
+           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 66fc3f7..9ae5ce2 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;apply=yes \
-           file://paths2.patch;apply=yes \
+           file://paths.patch \
+           file://paths2.patch \
 	   file://yum-install-recommends.py \
 	   file://extract-postinst.awk"
 
diff --git a/recipes/zaurusd/zaurusd_svn.bb b/recipes/zaurusd/zaurusd_svn.bb
index e673c7b..47d5106 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;apply=yes \
-	   file://alsa-cxx00-default.state.patch;apply=yes \
-	   file://alsa-6000x-default.state.patch;apply=yes \
-	   file://disable-alsa-handling.patch;apply=yes \
-	   file://avoid-rotated-server.patch;apply=yes \
+	   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;apply=yes "
+       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 e20d717..7774286 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;apply=yes \
-           file://qtopia17.patch;apply=yes"
+           file://opie-icons.patch \
+           file://qtopia17.patch"
 
 S = "${WORKDIR}"
 
diff --git a/recipes/zcip/zcip_4.bb b/recipes/zcip/zcip_4.bb
index 156fc18..348e0b1 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;apply=yes \
-	   file://linux-types.patch;apply=yes \
-	   file://char-signed-idiocy.patch;apply=yes"
+	   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 fe46597..6d85458 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;apply=yes"
+           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 35a6ce0..b8c94ce 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;apply=yes"
+           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 b06f879..093cf30 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;apply=yes \
-	   file://busybox.patch;apply=yes \
+	   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 9490a26..8ce2309 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;apply=yes \
-	   file://zeroconf-limits.h.patch;apply=yes \
+	   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 33ee7af..ceb2d7a 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;apply=yes"
+           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 d5ffc8f..76c293c 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;apply=yes"
+	   file://for_build.patch"
 S = "${WORKDIR}/zile-${UV}"
 
 inherit autotools
diff --git a/recipes/zipsc/zipsc_0.4.3.bb b/recipes/zipsc/zipsc_0.4.3.bb
index db1f773..1fb5f98 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;apply=yes"
+           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 54ad6f9..55cf650 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;apply=yes"
+           file://qtopia17.patch"
 S = "${WORKDIR}/zlaps-src"
 
 inherit palmtop
diff --git a/recipes/zlib/zlib_1.2.3.bb b/recipes/zlib/zlib_1.2.3.bb
index a08f744..f3736d1 100644
--- a/recipes/zlib/zlib_1.2.3.bb
+++ b/recipes/zlib/zlib_1.2.3.bb
@@ -2,8 +2,8 @@ include zlib.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "	file://visibility.patch;apply=yes \
-		file://autotools.patch;apply=yes "
+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
index c5bdac3..34419f0 100644
--- a/recipes/zlib/zlib_1.2.5.bb
+++ b/recipes/zlib/zlib_1.2.5.bb
@@ -2,7 +2,7 @@ include zlib.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://0001-autotools.patch;apply=yes "
+SRC_URI += "file://0001-autotools.patch "
 
 SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0"
 SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307"
diff --git a/recipes/zrally/zrally_0.90.bb b/recipes/zrally/zrally_0.90.bb
index 42334f6..a2328c0 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;apply=yes;striplevel=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 6f63644..1026d0a 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;apply=yes"
+	 file://configure.patch"
 
 inherit autotools
 
diff --git a/recipes/zten/zten_1.6.2.bb b/recipes/zten/zten_1.6.2.bb
index b520e08..32ec721 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;apply=yes"
+           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 32d4ed4..0ac2254 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;apply=yes"
+           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 4b102dd..12b6b2f 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;apply=yes"
+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 e968fc0..7cb4c48 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;apply=yes"
+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 7a47a38..2effd91 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;apply=yes \
-  file://zziplib-autoconf.patch;apply=yes \
+  file://zip_c.patch \
+  file://zziplib-autoconf.patch \
   "
 
 #EXTRA_OECONF = "--srcdir=${S} --enable-builddir=${S}/build"
-- 
1.7.0.4





More information about the Openembedded-devel mailing list