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, 18 insertions, 18 deletions

diff --git a/recipes/gpephone/calendar2_svn.bb b/recipes/gpephone/calendar2_svn.bb
index 62b946fca6..a5a09a46fd 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 89d5d2ebcd..3e13c150cd 100644
--- a/recipes/gpephone/cms92init_0.1.bb
+++ b/recipes/gpephone/cms92init_0.1.bb
@@ -8,7 +8,7 @@ PR = "r0"
 inherit gpephone
 
 SRC_URI = "${GPEPHONE_MIRROR}/GPRS/GPRS-${PV}.tar.bz2 \
-           file://oe-install.patch;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 062d40593f..6db12c7625 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 59b78d408e..a1fdeb3ae1 100644
--- a/recipes/gpephone/gpe-session-scripts-phone_0.67.bb
+++ b/recipes/gpephone/gpe-session-scripts-phone_0.67.bb
@@ -12,7 +12,7 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \
            file://matchbox-session.vm \
            file://phonesession \
 	   file://disable-composite.xsettings \
-           file://standard-apps.patch;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 ff9acdb61d..9c7c9fc80a 100644
--- a/recipes/gpephone/gsmmux_alpha-2.bb
+++ b/recipes/gpephone/gsmmux_alpha-2.bb
@@ -9,7 +9,7 @@ DEPENDS = "glibc"
 inherit gpe
 
 SRC_URI = "http://download2.berlios.de/gsmmux/${P}.tar.gz \
-           file://gsmmux-makefile.patch;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 960bb8718b..cf70030648 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 6f874c5725..adbe3aa556 100644
--- a/recipes/gpephone/libchenabler_0.1.bb
+++ b/recipes/gpephone/libchenabler_0.1.bb
@@ -9,7 +9,7 @@ GPE_TARBALL_SUFFIX = "gz"
 
 inherit gpephone pkgconfig autotools
 
-SRC_URI += "file://po.patch;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 8512ce1e89..16a7bba132 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 5ce234ed9e..af886cf908 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;apply=yes"
+SRC_URI += " file://disable-tests.patch file://libgemwidget-fixup.diff"
 
 FILES_${PN} += "${datadir}/gem"
 
diff --git a/recipes/gpephone/libiac2_svn.bb b/recipes/gpephone/libiac2_svn.bb
index afd8779585..fbec4092e0 100644
--- a/recipes/gpephone/libiac2_svn.bb
+++ b/recipes/gpephone/libiac2_svn.bb
@@ -11,7 +11,7 @@ PR = "r0"
 inherit gpephone pkgconfig autotools
 
 SRC_URI = "${GPEPHONE_SVN} \
-           file://disable-tests.patch;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 1461ca0dc8..d33a109886 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 6aa515ebc1..337d73c2c4 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 669a648f9e..0d20693fad 100644
--- a/recipes/gpephone/linphone_1.5.0.bb
+++ b/recipes/gpephone/linphone_1.5.0.bb
@@ -6,8 +6,8 @@ DEPENDS = "libosip2 speex libogg alsa-lib readline"
 PR = "r2"
 
 SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/1.5.x/source/linphone-${PV}.tar.gz \
-           file://linphone-1.5.0.patch;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 96f2f02ebb..e2adf2c3f3 100644
--- a/recipes/gpephone/phoneserver_1.0.bb
+++ b/recipes/gpephone/phoneserver_1.0.bb
@@ -11,8 +11,8 @@ DEPENDS = "dbus-glib glib-2.0  libmsgenabler libabenabler"
 GPE_TARBALL_SUFFIX= "bz2"
 inherit gpephone autotools
 
-SRC_URI_append_x86 = " file://changeport.patch;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 aeeaad9b5e..151caa3514 100644
--- a/recipes/gpephone/sms_1.0.bb
+++ b/recipes/gpephone/sms_1.0.bb
@@ -10,7 +10,7 @@ GPE_TARBALL_SUFFIX = "bz2"
 
 inherit gpephone autotools
 
-SRC_URI += " file://somefixes.patch;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 ee2cda8c6e..3983ea1aef 100644
--- a/recipes/gpephone/xoo-vm_0.7-20070204.bb
+++ b/recipes/gpephone/xoo-vm_0.7-20070204.bb
@@ -9,7 +9,7 @@ PV = "0.7+svn${SRCDATE}"
 PR = "r3"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=Xoo;proto=http \
-           file://gpephone-vm.patch;apply=yes;striplevel=0"
+           file://gpephone-vm.patch;striplevel=0"
 
 S = "${WORKDIR}/Xoo"