Make the do_patch apply=yes param implicit if extension is .diff/.patch

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

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Acked-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Khem Raj <raj.khem@gmail.com>

16 files changed, 24 insertions, 24 deletions

diff --git a/recipes/bluez/bcm2035-tool_0.0.bb b/recipes/bluez/bcm2035-tool_0.0.bb
index 30d0037395..51173c5553 100644
--- a/recipes/bluez/bcm2035-tool_0.0.bb
+++ b/recipes/bluez/bcm2035-tool_0.0.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 PR = "r1"
 
 SRC_URI = "http://people.openezx.org/wyrm/bcm2035-tool.tgz \
-           file://addr-as-arg.patch;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 9ca1172597..736c03dfa0 100644
--- a/recipes/bluez/bluez-cups-backend_3.33.bb
+++ b/recipes/bluez/bluez-cups-backend_3.33.bb
@@ -6,7 +6,7 @@ DEPENDS += "cups"
 
 # TI patch landed upstream sometime between 3.35 and 3.36, 
 # albeit in a somewhat different form
-SRC_URI += "file://hciattach-ti-bts.patch;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 2ab45c1ee9..4d9cbfaf00 100644
--- a/recipes/bluez/bluez-gnome_1.8.bb
+++ b/recipes/bluez/bluez-gnome_1.8.bb
@@ -6,8 +6,8 @@ DEPENDS = "dbus-glib gconf libnotify gtk+"
 RRECOMMENDS = "gnome-icon-theme"
 
 SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/${P}.tar.gz \
-	   file://add-device-from-rfcomm-crash.patch;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 0f28cedf9a..710987b227 100644
--- a/recipes/bluez/bluez-gnome_git.bb
+++ b/recipes/bluez/bluez-gnome_git.bb
@@ -7,7 +7,7 @@ DEPENDS = "dbus-glib gconf libnotify gtk+"
 
 SRCREV = "c4ccbf7c4d0aa55e234d30e6daee494e496c7c7f"
 SRC_URI = "git://git.kernel.org/pub/scm/bluetooth/bluez-gnome.git;protocol=git;branch=master "
-#           file://pkgconfig-add-gthread.patch;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 fa76c9a0ee..1cc93efe78 100644
--- a/recipes/bluez/bluez-gstreamer-plugin_3.33.bb
+++ b/recipes/bluez/bluez-gstreamer-plugin_3.33.bb
@@ -6,7 +6,7 @@ DEPENDS += "gstreamer gst-plugins-base "
 
 # TI patch landed upstream sometime between 3.35 and 3.36, 
 # albeit in a somewhat different form
-SRC_URI += "file://hciattach-ti-bts.patch;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 0e967a2260..c48ed1bef8 100644
--- a/recipes/bluez/bluez-utils-alsa_3.33.bb
+++ b/recipes/bluez/bluez-utils-alsa_3.33.bb
@@ -6,7 +6,7 @@ DEPENDS += "alsa-lib"
 
 # TI patch landed upstream sometime between 3.35 and 3.36, 
 # albeit in a somewhat different form
-SRC_URI += "file://hciattach-ti-bts.patch;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 ff6180b205..9933748eb6 100644
--- a/recipes/bluez/bluez-utils.inc
+++ b/recipes/bluez/bluez-utils.inc
@@ -10,14 +10,14 @@ LICENSE = "GPL"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 	file://hcid.conf \
-	file://hciattach-ti-bts.patch;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 1c540a4a8a..d75745954d 100644
--- a/recipes/bluez/bluez-utils3.inc
+++ b/recipes/bluez/bluez-utils3.inc
@@ -12,7 +12,7 @@ FILESPATH = "${FILE_DIRNAME}/bluez-utils-${PV}:${FILE_DIRNAME}/bluez-utils"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
            file://hcid.conf \
-           file://sbc-thumb.patch;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 2335eec75d..8d202dad78 100644
--- a/recipes/bluez/bluez-utils_3.33.bb
+++ b/recipes/bluez/bluez-utils_3.33.bb
@@ -4,7 +4,7 @@ PR = "r3"
 
 # TI patch landed upstream sometime between 3.35 and 3.36, 
 # albeit in a somewhat different form
-SRC_URI += "file://hciattach-ti-bts.patch;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 adf30478de..0083f15440 100644
--- a/recipes/bluez/bluez4-libs.inc
+++ b/recipes/bluez/bluez4-libs.inc
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 INC_PR = "r1"
 
 SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
-        file://avinfo-link.patch;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 a398781829..1807c95ea7 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 3d91a86c1e..17fd98f462 100644
--- a/recipes/bluez/bluez4_4.31.bb
+++ b/recipes/bluez/bluez4_4.31.bb
@@ -8,10 +8,10 @@ PR = "r7"
 
 SRC_URI = "\
   http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
-  file://fix-dfutool-usb-declaration-mismatch.patch;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 757a0e6e6b..1b2260251f 100644
--- a/recipes/bluez/bluez4_4.35.bb
+++ b/recipes/bluez/bluez4_4.35.bb
@@ -15,8 +15,8 @@ PR = "r2"
 
 SRC_URI = "\
   http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
-  file://fix-dfutool-usb-declaration-mismatch.patch;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 0d0c3a4645..b1dabd1a1a 100644
--- a/recipes/bluez/bluez4_4.37.bb
+++ b/recipes/bluez/bluez4_4.37.bb
@@ -15,8 +15,8 @@ PR = "r1"
 
 SRC_URI = "\
   http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
-  file://fix-dfutool-usb-declaration-mismatch.patch;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 2b2c7e3be0..c305b10a40 100644
--- a/recipes/bluez/obexd_0.22.bb
+++ b/recipes/bluez/obexd_0.22.bb
@@ -5,7 +5,7 @@ DEPENDS_append_shr = " libframeworkd-glib "
 LICENSE = "GPLv2"
 
 SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/obexd-${PV}.tar.gz;name=archive"
-SRC_URI_append_shr = " file://obexd-add-fso-support.patch;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 e60534ef7b..42b9008805 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}"