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>

9 files changed, 18 insertions, 18 deletions

diff --git a/recipes/hostap/hostap-daemon.inc b/recipes/hostap/hostap-daemon.inc
index f723d07575..b98572e4bf 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;patch=1;pnum=0 \
-	file://madwifi-bsd-fix.diff;patch=1;pnum=0 \
+	file://makefile-cross.diff;apply=yes;striplevel=0 \
+	file://madwifi-bsd-fix.diff;apply=yes;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 f1a73c3358..34d5415d37 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;patch=1"
+	file://hostap-no-bsd.patch;apply=yes"
 
 
 PR = "r2"
diff --git a/recipes/hostap/hostap-daemon_0.5.10.bb b/recipes/hostap/hostap-daemon_0.5.10.bb
index 79441ffe90..dd27dfdc68 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;patch=1 \
+	file://makefile-cross.diff;apply=yes \
 	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 7ffa2a1f80..e3fe5490bf 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;patch=1 \
+	file://ldflags.patch;apply=yes \
 	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 7227b609af..5f5b87cd32 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;patch=1 \
-	   file://hostap-driver-0.4.7.patch;patch=1;pnum=1 \
+SRC_URI += "file://kernel_updates.patch;apply=yes \
+	   file://hostap-driver-0.4.7.patch;apply=yes \
            file://hostap_cs.conf "
-SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \
-	file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
+SRC_URI_append_mtx-1 = " file://mtx_compat.diff;apply=yes;striplevel=0 \
+	file://mtx_hostap_deferred_irq.diff;apply=yes;striplevel=0"
 
 S = "${WORKDIR}/hostap-driver-${PV}"
 
diff --git a/recipes/hostap/hostap-modules.inc b/recipes/hostap/hostap-modules.inc
index 3184f00fb3..4a2afc5471 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;patch=1;pnum=0 \
-	file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
-SRC_URI_append_mtx-2 = " file://mtx_compat.diff;patch=1;pnum=0 \
-	file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
-SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 "
+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 "
 
 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 b75eb0dddc..1ba888710f 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;patch=1"
+SRC_URI += "file://kernel_updates.patch;apply=yes"
 
 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 8ca4161361..90424954bb 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;patch=1"
+SRC_URI += "file://kernel_updates.patch;apply=yes"
 
 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 084f6d14cf..d960fce470 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;patch=1 \
-	   file://ldflags.patch;patch=1"
+	   file://hostap-fw-load.patch;apply=yes \
+	   file://ldflags.patch;apply=yes"
 
 S = "${WORKDIR}/hostap-utils-${PV}"