Rename url params patch=<ignored>/pnum=<n> to apply={yes,no}/striplevel=<n>

I think this makes the behavior rather more clear.

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

12 files changed, 18 insertions, 18 deletions

diff --git a/recipes/mesa/mesa-common-old.inc b/recipes/mesa/mesa-common-old.inc
index a88a07f019..3687bf5c43 100644
--- a/recipes/mesa/mesa-common-old.inc
+++ b/recipes/mesa/mesa-common-old.inc
@@ -2,7 +2,7 @@ SECTION = "x11"
 PE = "2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
-	file://mklib-rpath-link.patch;patch=1"
+	file://mklib-rpath-link.patch;apply=yes"
 
 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 ec4bce37bf..448374f7fe 100644
--- a/recipes/mesa/mesa-dri_6.5.2.bb
+++ b/recipes/mesa/mesa-dri_6.5.2.bb
@@ -1,6 +1,6 @@
 include mesa-common-old.inc
 
-SRC_URI += " file://mklib-cross.patch;patch=1"
+SRC_URI += " file://mklib-cross.patch;apply=yes"
 
 FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
diff --git a/recipes/mesa/mesa-dri_7.0.3.bb b/recipes/mesa/mesa-dri_7.0.3.bb
index 71704e3599..bf9aeda286 100644
--- a/recipes/mesa/mesa-dri_7.0.3.bb
+++ b/recipes/mesa/mesa-dri_7.0.3.bb
@@ -1,7 +1,7 @@
 include mesa-common-old.inc
 
 # suppress mklib-rpath-link patch from mesa-common
-SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 file://mklib-cross.patch;patch=1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 file://mklib-cross.patch;apply=yes"
 
 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 4cf55a40c0..0219cce2ac 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;patch=1 \
-	   file://glamo.patch;patch=1 \
+	   file://fix-progs-makefile.patch;apply=yes \
+	   file://glamo.patch;apply=yes \
           "
 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 46b7faa7a9..d62d565eb8 100644
--- a/recipes/mesa/mesa-dri_7.8.bb
+++ b/recipes/mesa/mesa-dri_7.8.bb
@@ -7,8 +7,8 @@ DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native mesa-dri-glsl-native"
 
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive \
            ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=demos \
-	   file://fix-progs-makefile.patch;patch=1 \
-	   file://glamo.patch;patch=1 \
+	   file://fix-progs-makefile.patch;apply=yes \
+	   file://glamo.patch;apply=yes \
           "
 SRC_URI[archive.md5sum] = "85cb891eecb89aae4fdd3499cccd934b"
 SRC_URI[archive.sha256sum] = "8c85db5844303b806b18fc6bd40a9dccb02d90b54878a94f910674673ba0aa35"
diff --git a/recipes/mesa/mesa-dri_git.bb b/recipes/mesa/mesa-dri_git.bb
index fe8bcd5966..47b185a3cd 100644
--- a/recipes/mesa/mesa-dri_git.bb
+++ b/recipes/mesa/mesa-dri_git.bb
@@ -17,8 +17,8 @@ SRCREV_shr = "1ac166895fef47806c9e9286d2a6356b4db8398d"
 
 SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git"
 SRC_URI_shr = "git://git.bitwiz.org.uk/mesa.git;protocol=git;branch=glamo"
-SRC_URI_append = " file://fix-progs-makefile.patch;patch=1"
-SRC_URI_shr_append = " file://fix-progs-makefile.patch;patch=1"
+SRC_URI_append = " file://fix-progs-makefile.patch;apply=yes"
+SRC_URI_shr_append = " file://fix-progs-makefile.patch;apply=yes"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/mesa/mesa-full_7.0.2.bb b/recipes/mesa/mesa-full_7.0.2.bb
index efb54e0d29..bd10afa47a 100644
--- a/recipes/mesa/mesa-full_7.0.2.bb
+++ b/recipes/mesa/mesa-full_7.0.2.bb
@@ -3,9 +3,9 @@ include mesa-mesa.inc
 SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2;name=archive \
         ${SOURCEFORGE_MIRROR}/mesa3d/MesaGLUT-${PV}.tar.bz2;name=glut \
         ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2;name=demos \
-        file://mklib-rpath-link.patch;patch=1 \
-        file://fix-host-compile.patch;patch=1 \
-        file://fix-progs-makefile.patch;patch=1 \
+        file://mklib-rpath-link.patch;apply=yes \
+        file://fix-host-compile.patch;apply=yes \
+        file://fix-progs-makefile.patch;apply=yes \
         "
 
 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 2e2851539c..098e6f401c 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;patch=1 \
+           file://fix-progs-makefile.patch;apply=yes \
           "
 
 SRC_URI[archive.md5sum] = "85cb891eecb89aae4fdd3499cccd934b"
diff --git a/recipes/mesa/mesa_6.0.1.bb b/recipes/mesa/mesa_6.0.1.bb
index 73f96f72e7..ad9a1e1bcf 100644
--- a/recipes/mesa/mesa_6.0.1.bb
+++ b/recipes/mesa/mesa_6.0.1.bb
@@ -1,7 +1,7 @@
 SECTION = "unknown"
 SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
-	file://Make-config.patch;patch=1 \
-	file://mklib.patch;patch=1"
+	file://Make-config.patch;apply=yes \
+	file://mklib.patch;apply=yes"
 S = "${WORKDIR}/Mesa-${PV}"
 PE = "2"
 LICENSE = "LGPL"
diff --git a/recipes/mesa/mesa_6.4.1+cvs20060101.bb b/recipes/mesa/mesa_6.4.1+cvs20060101.bb
index 7eb52b2579..557f98ab00 100644
--- a/recipes/mesa/mesa_6.4.1+cvs20060101.bb
+++ b/recipes/mesa/mesa_6.4.1+cvs20060101.bb
@@ -5,7 +5,7 @@ PV = "6.4.1+cvs${SRCDATE}"
 PE = "2"
 
 SRC_URI = "${FREEDESKTOP_CVS}/mesa;module=Mesa;method=pserver;date=${SRCDATE} \
-	file://mklib-rpath-link.patch;patch=1"
+	file://mklib-rpath-link.patch;apply=yes"
 S = "${WORKDIR}/Mesa"
 
 LICENSE = "LGPL"
diff --git a/recipes/mesa/mesa_6.5.2.bb b/recipes/mesa/mesa_6.5.2.bb
index cbb2a32ddb..49aa5d1ac0 100644
--- a/recipes/mesa/mesa_6.5.2.bb
+++ b/recipes/mesa/mesa_6.5.2.bb
@@ -2,7 +2,7 @@ include mesa-mesa.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI_append = " file://fix-host-compile.patch;patch=1 "
+SRC_URI_append = " file://fix-host-compile.patch;apply=yes "
 
 SRC_URI[md5sum] = "e4d894181f1859651658b3704633e10d"
 SRC_URI[sha256sum] = "137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f"
diff --git a/recipes/mesa/mesa_7.0.2.bb b/recipes/mesa/mesa_7.0.2.bb
index a5063cf9f8..2d45faa1b6 100644
--- a/recipes/mesa/mesa_7.0.2.bb
+++ b/recipes/mesa/mesa_7.0.2.bb
@@ -2,7 +2,7 @@ include mesa-mesa.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI_append = " file://fix-host-compile.patch;patch=1 "
+SRC_URI_append = " file://fix-host-compile.patch;apply=yes "
 
 SRC_URI[md5sum] = "93e6ed7924ff069a4f883b4fce5349dc"
 SRC_URI[sha256sum] = "9d4707b556960f6aef14480f91fcd4f868720f64321947ab1b2fd20e85ce7f9e"