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>

13 files changed, 28 insertions, 28 deletions

diff --git a/recipes/networkmanager/netm-cli_0.2.bb b/recipes/networkmanager/netm-cli_0.2.bb
index 554719a9fc..34bc7bf8c5 100644
--- a/recipes/networkmanager/netm-cli_0.2.bb
+++ b/recipes/networkmanager/netm-cli_0.2.bb
@@ -8,6 +8,6 @@ PR = "r3"
 inherit setuptools
 
 SRC_URI = "git://dev.openbossa.org/mamona/users/salveti/netm-cli.git;protocol=http;tag=netm-cli-${PV}"
-SRC_URI_append_mamona = " file://scan_support.patch;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 ee5eee2391..1f7276199f 100644
--- a/recipes/networkmanager/networkmanager-applet_0.6.6.bb
+++ b/recipes/networkmanager/networkmanager-applet_0.6.6.bb
@@ -7,7 +7,7 @@ RDEPENDS = "networkmanager"
 inherit gnome gtk-icon-cache
 
 SRC_URI = "http://people.redhat.com/dcbw/NetworkManager/0.6.6/nm-applet-0.6.6.tar.gz \
- file://applet-no-gnome.diff;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 bfdbd841ee..ea8c0a8191 100644
--- a/recipes/networkmanager/networkmanager-applet_svn.bb
+++ b/recipes/networkmanager/networkmanager-applet_svn.bb
@@ -7,7 +7,7 @@ RDEPENDS = "networkmanager"
 inherit gnome gtk-icon-cache
 
 SRC_URI = "svn://svn.gnome.org/svn/network-manager-applet/;module=trunk;proto=http \
-           file://applet-no-gnome.diff;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 9aafb6b7b6..f7f9746002 100644
--- a/recipes/networkmanager/networkmanager_0.6.4.bb
+++ b/recipes/networkmanager/networkmanager_0.6.4.bb
@@ -9,8 +9,8 @@ RDEPENDS = "wpa-supplicant iproute2 dhcdbd gnome-keyring hicolor-icon-theme"
 PR = "r6"
 
 SRC_URI="http://www.handhelds.org/~mmp/files/NetworkManager-${PV}-gpe.tar.gz \
-	file://dbus-api-fix.patch;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 9bdd56bf8d..e3043322a1 100644
--- a/recipes/networkmanager/networkmanager_0.6.6.bb
+++ b/recipes/networkmanager/networkmanager_0.6.6.bb
@@ -6,17 +6,17 @@ PR = "r7"
 SRC_URI = "http://people.redhat.com/dcbw/NetworkManager/0.6.6/NetworkManager-0.6.6.tar.gz \
 	       file://25NetworkManager \
 	       file://99_networkmanager \
-           file://fix_seg_fault.patch;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 abadd96a52..812f101fa0 100644
--- a/recipes/networkmanager/networkmanager_0.7.1.997.bb
+++ b/recipes/networkmanager/networkmanager_0.7.1.997.bb
@@ -3,7 +3,7 @@ require networkmanager-0.7.inc
 PR = "r1"
 
 SRC_URI += " \
-    file://remove-gtk-doc-make.patch;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 6ba08e2170..7bada30efd 100644
--- a/recipes/networkmanager/networkmanager_0.7.1.bb
+++ b/recipes/networkmanager/networkmanager_0.7.1.bb
@@ -3,10 +3,10 @@ require networkmanager-0.7.inc
 PR = "r1"
 
 SRC_URI += " \
-	file://remove-gtk-doc-make.patch;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 ab23788364..35f6a33232 100644
--- a/recipes/networkmanager/networkmanager_0.7.999.bb
+++ b/recipes/networkmanager/networkmanager_0.7.999.bb
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE = "-1"
 PR = "r3"
 
 SRC_URI += " \
-    file://remove-gtk-doc-make.patch;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 588a96b4d3..64fdace664 100644
--- a/recipes/networkmanager/networkmanager_0.7.bb
+++ b/recipes/networkmanager/networkmanager_0.7.bb
@@ -4,16 +4,16 @@ PV = "0.7"
 PR = "r10"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.7/NetworkManager-0.7.0.tar.bz2 \
-	file://remove-gtk-doc-make.patch;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 814c159ea6..16cf9c52f2 100644
--- a/recipes/networkmanager/networkmanager_0.7olpc.bb
+++ b/recipes/networkmanager/networkmanager_0.7olpc.bb
@@ -6,6 +6,6 @@ PV = "0.7olpc+git"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI += "git://dev.laptop.org/users/sjoerd/NetworkManager.git;protocol=git;branch=olpc-patches;tag=f1fa6c27710196b7327402c59b2c55d920a12bb0 \
-            file://define_kernel_types_for_old_linux_headers_and_warn_functions_from_glib_2_16.patch;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 1379542200..21aace01d1 100644
--- a/recipes/networkmanager/networkmanager_0.8.bb
+++ b/recipes/networkmanager/networkmanager_0.8.bb
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE = "-1"
 PR = "r4"
 
 SRC_URI += " \
-    file://remove-gtk-doc-make.patch;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 777fe59b4d..39b0bf3ca5 100644
--- a/recipes/networkmanager/networkmanager_git.bb
+++ b/recipes/networkmanager/networkmanager_git.bb
@@ -9,7 +9,7 @@ PR_append = ".gitr${SRCREV}"
 inherit gnome
 
 SRC_URI = "git://anongit.freedesktop.org/NetworkManager/NetworkManager;protocol=git;branch=NETWORKMANAGER_0_7 \
-	file://remove-gtk-doc-make.patch;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 d5e5817bdd..b8bda2e1f2 100644
--- a/recipes/networkmanager/networkmanager_svn.bb
+++ b/recipes/networkmanager/networkmanager_svn.bb
@@ -8,8 +8,8 @@ PR = "r1"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI += "svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
-            file://define_kernel_types_for_old_linux_headers.patch;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"