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>

25 files changed, 228 insertions, 228 deletions

diff --git a/recipes/xorg-xserver/xserver-kdrive-common.inc b/recipes/xorg-xserver/xserver-kdrive-common.inc
index 9df0232f9c..aad7df8e3a 100644
--- a/recipes/xorg-xserver/xserver-kdrive-common.inc
+++ b/recipes/xorg-xserver/xserver-kdrive-common.inc
@@ -75,19 +75,19 @@ FILES_${PKGN}-via = "${bindir}/Xvia"
 SRC_URI ?= "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2;name=archive \
 	${KDRIVE_COMMON_PATCHES}"
 KDRIVE_COMMON_PATCHES = " \
-	file://kmode.patch;patch=1 \
-	file://kmode-800_480.patch;patch=1 \
-	file://disable-apm.patch;patch=1 \
-	file://no-serial-probing.patch;patch=1 \
-	file://fbdev-not-fix.patch;patch=1  \
-	file://optional-xkb.patch;patch=1 \
-	file://enable-tslib.patch;patch=1 \
-	file://kmode-palm.patch;patch=1 \
+	file://kmode.patch;apply=yes \
+	file://kmode-800_480.patch;apply=yes \
+	file://disable-apm.patch;apply=yes \
+	file://no-serial-probing.patch;apply=yes \
+	file://fbdev-not-fix.patch;apply=yes  \
+	file://optional-xkb.patch;apply=yes \
+	file://enable-tslib.patch;apply=yes \
+	file://kmode-palm.patch;apply=yes \
 	"
 
-SRC_URI_append_mnci   = " file://onlyfb.patch;patch=1"
-SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
-SRC_URI_append_qemux86 = " file://xserver-kdrive-poodle.patch;patch=1"
+SRC_URI_append_mnci   = " file://onlyfb.patch;apply=yes"
+SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;apply=yes"
+SRC_URI_append_qemux86 = " file://xserver-kdrive-poodle.patch;apply=yes"
 PACKAGE_ARCH_poodle = "${MACHINE_ARCH}"
 PACKAGE_ARCH_qemux86 = "${MACHINE_ARCH}"
 
diff --git a/recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb b/recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
index 0fb56022d4..0c4c73eb04 100644
--- a/recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
+++ b/recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
@@ -12,18 +12,18 @@ PR = "r8"
 FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-${PV}:${FILE_DIRNAME}/xserver-kdrive:${FILE_DIRNAME}/files"
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
-	file://kdrive-evdev.patch;patch=1  \
-	file://kdrive-use-evdev.patch;patch=1  \
-	file://disable-xf86-dga-xorgcfg.patch;patch=1 \
-	file://enable-xcalibrate.patch;patch=1 \
-        file://fbcompositesrc8888revnpx0565.patch;patch=1 \
-        file://kdrive-vidmemarea.patch;patch=1 \
-        file://kdrive-imageon.patch;patch=1 \
-        file://xcalibrate_coords.patch;patch=1 \
-        file://enable-builtin-fonts.patch;patch=1 \
-	file://fix-picturestr-include-order.patch;patch=1 \
-	file://split_multiple_AC_SUBST.patch;patch=1 \
-	file://report-correct-randr10.patch;patch=1 \
+	file://kdrive-evdev.patch;apply=yes  \
+	file://kdrive-use-evdev.patch;apply=yes  \
+	file://disable-xf86-dga-xorgcfg.patch;apply=yes \
+	file://enable-xcalibrate.patch;apply=yes \
+        file://fbcompositesrc8888revnpx0565.patch;apply=yes \
+        file://kdrive-vidmemarea.patch;apply=yes \
+        file://kdrive-imageon.patch;apply=yes \
+        file://xcalibrate_coords.patch;apply=yes \
+        file://enable-builtin-fonts.patch;apply=yes \
+	file://fix-picturestr-include-order.patch;apply=yes \
+	file://split_multiple_AC_SUBST.patch;apply=yes \
+	file://report-correct-randr10.patch;apply=yes \
 	"
        
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/recipes/xorg-xserver/xserver-kdrive-nomadik_1.3.0.0.bb b/recipes/xorg-xserver/xserver-kdrive-nomadik_1.3.0.0.bb
index 98f221b58b..079e4d2295 100644
--- a/recipes/xorg-xserver/xserver-kdrive-nomadik_1.3.0.0.bb
+++ b/recipes/xorg-xserver/xserver-kdrive-nomadik_1.3.0.0.bb
@@ -18,10 +18,10 @@ RDEPENDS_xserver-kdrive-nomadikfb = "sga-init"
 RRECOMMENDS_xserver-kdrive-nomadikfb = "kernel-module-nmdkmod-sva"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
-        file://nomadik_xserver_1300.patch;patch=1 \
-        file://nomadik_xserver_sva_service_cleanup.patch;patch=1 \
-        file://autotools.patch;patch=1 \
-        file://fix-picturestr-include-order.patch;patch=1" 
+        file://nomadik_xserver_1300.patch;apply=yes \
+        file://nomadik_xserver_sva_service_cleanup.patch;apply=yes \
+        file://autotools.patch;apply=yes \
+        file://fix-picturestr-include-order.patch;apply=yes" 
 
 S = "${WORKDIR}/xorg-server-${PV}"
 
diff --git a/recipes/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb b/recipes/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
index fa908ccab0..e964720b72 100644
--- a/recipes/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
+++ b/recipes/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
@@ -15,24 +15,24 @@ COMPATIBLE_MACHINE = "nokia(800|770)"
 FILES_${PN} = "${libdir}/xserver /etc/dbus-1/* ${bindir}/Xomap"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/xorg-server_1.1.99.3-0osso31.tar.gz \
-	file://kmode.patch;patch=1 \
-	file://disable-apm.patch;patch=1 \
-	file://no-serial-probing.patch;patch=1 \
-	file://fbdev-not-fix.patch;patch=1  \
-	file://enable-builtin-fonts.patch;patch=1 \
-	file://xcalibrate.patch;patch=1 \
-	file://fixups.patch;patch=1 \
-	file://button_only.patch;patch=1 \
-	file://calibrateext.patch;patch=1 \
-        file://fix-picturestr-include-order.patch;patch=1 \
-	file://xcalibrate_coords.patch;patch=1 \
-	file://report-correct-randr10.patch;patch=1"
-#	file://kdrive-evdev.patch;patch=1  \
-#	file://kdrive-use-evdev.patch;patch=1  \
-#	file://optional-xkb.patch;patch=1 \
-#	file://disable-xf86-dga-xorgcfg.patch;patch=1 \
-#	file://enable-tslib.patch;patch=1 \
-#	file://xfbdev-fb-opt.patch;patch=1"
+	file://kmode.patch;apply=yes \
+	file://disable-apm.patch;apply=yes \
+	file://no-serial-probing.patch;apply=yes \
+	file://fbdev-not-fix.patch;apply=yes  \
+	file://enable-builtin-fonts.patch;apply=yes \
+	file://xcalibrate.patch;apply=yes \
+	file://fixups.patch;apply=yes \
+	file://button_only.patch;apply=yes \
+	file://calibrateext.patch;apply=yes \
+        file://fix-picturestr-include-order.patch;apply=yes \
+	file://xcalibrate_coords.patch;apply=yes \
+	file://report-correct-randr10.patch;apply=yes"
+#	file://kdrive-evdev.patch;apply=yes  \
+#	file://kdrive-use-evdev.patch;apply=yes  \
+#	file://optional-xkb.patch;apply=yes \
+#	file://disable-xf86-dga-xorgcfg.patch;apply=yes \
+#	file://enable-tslib.patch;apply=yes \
+#	file://xfbdev-fb-opt.patch;apply=yes"
 
 S = "${WORKDIR}/xorg-server-1.1.99.3"
 
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.1.0.bb b/recipes/xorg-xserver/xserver-kdrive_1.1.0.bb
index 13bea4c0c4..549693e31d 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.1.0.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.1.0.bb
@@ -22,24 +22,24 @@ RDEPENDS_xserver-kdrive-fake = "${PN}"
 RDEPENDS_xserver-kdrive-xephyr = "${PN}"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-1.1.0.tar.bz2 \
-	file://kmode.patch;patch=1 \
-	file://disable-apm.patch;patch=1 \
-	file://no-serial-probing.patch;patch=1 \
-	file://kdrive-evdev.patch;patch=1  \
-	file://kdrive-use-evdev.patch;patch=1  \
-	file://fbdev-not-fix.patch;patch=1  \
-	file://enable-builtin-fonts.patch;patch=1 \
-	file://optional-xkb.patch;patch=1 \
-	file://disable-xf86-dga-xorgcfg.patch;patch=1 \
-	file://enable-tslib.patch;patch=1 \
-	file://xcalibrate.patch;patch=1 \
-	file://xfbdev-fb-opt.patch;patch=1 \
-	file://hide-cursor-and-ppm-root.patch;patch=1 \
-	file://report-correct-randr10.patch;patch=1"
+	file://kmode.patch;apply=yes \
+	file://disable-apm.patch;apply=yes \
+	file://no-serial-probing.patch;apply=yes \
+	file://kdrive-evdev.patch;apply=yes  \
+	file://kdrive-use-evdev.patch;apply=yes  \
+	file://fbdev-not-fix.patch;apply=yes  \
+	file://enable-builtin-fonts.patch;apply=yes \
+	file://optional-xkb.patch;apply=yes \
+	file://disable-xf86-dga-xorgcfg.patch;apply=yes \
+	file://enable-tslib.patch;apply=yes \
+	file://xcalibrate.patch;apply=yes \
+	file://xfbdev-fb-opt.patch;apply=yes \
+	file://hide-cursor-and-ppm-root.patch;apply=yes \
+	file://report-correct-randr10.patch;apply=yes"
 
-SRC_URI_append_mnci   = " file://onlyfb.patch;patch=1"
-SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
-SRC_URI_append_qemux86 = " file://xserver-kdrive-poodle.patch;patch=1"
+SRC_URI_append_mnci   = " file://onlyfb.patch;apply=yes"
+SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;apply=yes"
+SRC_URI_append_qemux86 = " file://xserver-kdrive-poodle.patch;apply=yes"
 PACKAGE_ARCH_poodle = "poodle"
 
 S = "${WORKDIR}/xorg-server-1.1.0"
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.2.0.bb b/recipes/xorg-xserver/xserver-kdrive_1.2.0.bb
index 0f85ff5d89..4d7e2a763a 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.2.0.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.2.0.bb
@@ -7,18 +7,18 @@ PR = "r11"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
-	file://enable-epson.patch;patch=1 \
-	file://enable-builtin-fonts.patch;patch=1 \
-	file://kdrive-evdev.patch;patch=1  \
-	file://kdrive-use-evdev.patch;patch=1  \
-	file://disable-xf86-dga-xorgcfg.patch;patch=1 \
-	file://enable-xcalibrate.patch;patch=1 \
-        file://w100.patch;patch=1 \
-        file://w100-autofoo.patch;patch=1 \
-        file://w100-fix-offscreen-bmp.patch;patch=1 \
-        file://fbcompositesrc8888revnpx0565.patch;patch=1 \
-        file://xcalibrate_coords.patch;patch=1 \
-	file://report-correct-randr10.patch;patch=1 \
+	file://enable-epson.patch;apply=yes \
+	file://enable-builtin-fonts.patch;apply=yes \
+	file://kdrive-evdev.patch;apply=yes  \
+	file://kdrive-use-evdev.patch;apply=yes  \
+	file://disable-xf86-dga-xorgcfg.patch;apply=yes \
+	file://enable-xcalibrate.patch;apply=yes \
+        file://w100.patch;apply=yes \
+        file://w100-autofoo.patch;apply=yes \
+        file://w100-fix-offscreen-bmp.patch;apply=yes \
+        file://fbcompositesrc8888revnpx0565.patch;apply=yes \
+        file://xcalibrate_coords.patch;apply=yes \
+	file://report-correct-randr10.patch;apply=yes \
 	"
        
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index 68af4aac4a..a98d5c55b1 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -7,31 +7,31 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
-	file://enable-epson.patch;patch=1 \
-	file://enable-builtin-fonts.patch;patch=1 \
-	file://kdrive-evdev.patch;patch=1  \
-	file://kdrive-use-evdev.patch;patch=1  \
-	file://disable-xf86-dga-xorgcfg.patch;patch=1 \
-        file://fix_default_mode.patch;patch=1 \
-	file://enable-xcalibrate.patch;patch=1 \
-	file://hide-cursor-and-ppm-root.patch;patch=1 \
-	file://xcalibrate_coords.patch;patch=1 \
-	file://w100.patch;patch=1 \
-	file://w100-autofoo.patch;patch=1 \
-	file://w100-fix-offscreen-bmp.patch;patch=1 \
-        file://kdrive-1.3-18bpp.patch;patch=1 \
-        file://linux-keyboard-mediumraw.patch;patch=1 \
-        file://gumstix-kmode.patch;patch=1 \
-        file://fix-picturestr-include-order.patch;patch=1 \
-        file://autotools.patch;patch=1 \
-	file://report-correct-randr12.patch;patch=1 \
+	file://enable-epson.patch;apply=yes \
+	file://enable-builtin-fonts.patch;apply=yes \
+	file://kdrive-evdev.patch;apply=yes  \
+	file://kdrive-use-evdev.patch;apply=yes  \
+	file://disable-xf86-dga-xorgcfg.patch;apply=yes \
+        file://fix_default_mode.patch;apply=yes \
+	file://enable-xcalibrate.patch;apply=yes \
+	file://hide-cursor-and-ppm-root.patch;apply=yes \
+	file://xcalibrate_coords.patch;apply=yes \
+	file://w100.patch;apply=yes \
+	file://w100-autofoo.patch;apply=yes \
+	file://w100-fix-offscreen-bmp.patch;apply=yes \
+        file://kdrive-1.3-18bpp.patch;apply=yes \
+        file://linux-keyboard-mediumraw.patch;apply=yes \
+        file://gumstix-kmode.patch;apply=yes \
+        file://fix-picturestr-include-order.patch;apply=yes \
+        file://autotools.patch;apply=yes \
+	file://report-correct-randr12.patch;apply=yes \
 "
 
 SRC_URI_append_avr32 = " \
-        file://xorg-avr32-support.diff;patch=1 \
+        file://xorg-avr32-support.diff;apply=yes \
 "
 
-SRC_URI_append_tosa = "file://tosa-fbdev.patch;patch=1"
+SRC_URI_append_tosa = "file://tosa-fbdev.patch;apply=yes"
 PACKAGE_ARCH_xserver-kdrive-fbdev_tosa = "${MACHINE_ARCH}"
 
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
index b8356404c7..ae46c80030 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
@@ -8,26 +8,26 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
-	file://enable-epson.patch;patch=1 \
-        file://fix_default_mode.patch;patch=1 \
-	file://enable-xcalibrate.patch;patch=1 \
-	file://hide-cursor-and-ppm-root.patch;patch=1 \
-	file://xcalibrate_coords.patch;patch=1 \
-	file://w100.patch;patch=1 \
-	file://w100-autofoo.patch;patch=1 \
-	file://w100-fix-offscreen-bmp.patch;patch=1 \
-	file://w100-new-input-world-order.patch;patch=1 \
-	file://linux-keyboard-mediumraw.patch;patch=1 \
-	file://xcalibrate-new-input-world-order.patch;patch=1 \
-	file://tslib-default-device.patch;patch=1 \
-	file://fbdev-evdev.patch;patch=1 \
-	file://keyboard-resume-workaround.patch;patch=1 \
-	file://xorg-avr32-support.diff;patch=1 \
-	file://pkgconfig_fix.patch;patch=1 \
-        file://no_xkb.patch;patch=1;pnum=0 \
-	file://xorg-1.4-kdrive-rotation.patch;patch=1 \
-	file://split_multiple_AC_SUBST.patch;patch=1 \
-	file://vm86_masks.patch;patch=1 \
+	file://enable-epson.patch;apply=yes \
+        file://fix_default_mode.patch;apply=yes \
+	file://enable-xcalibrate.patch;apply=yes \
+	file://hide-cursor-and-ppm-root.patch;apply=yes \
+	file://xcalibrate_coords.patch;apply=yes \
+	file://w100.patch;apply=yes \
+	file://w100-autofoo.patch;apply=yes \
+	file://w100-fix-offscreen-bmp.patch;apply=yes \
+	file://w100-new-input-world-order.patch;apply=yes \
+	file://linux-keyboard-mediumraw.patch;apply=yes \
+	file://xcalibrate-new-input-world-order.patch;apply=yes \
+	file://tslib-default-device.patch;apply=yes \
+	file://fbdev-evdev.patch;apply=yes \
+	file://keyboard-resume-workaround.patch;apply=yes \
+	file://xorg-avr32-support.diff;apply=yes \
+	file://pkgconfig_fix.patch;apply=yes \
+        file://no_xkb.patch;apply=yes;striplevel=0 \
+	file://xorg-1.4-kdrive-rotation.patch;apply=yes \
+	file://split_multiple_AC_SUBST.patch;apply=yes \
+	file://vm86_masks.patch;apply=yes \
         "
 
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb
index 4f7b460c67..0c4590812e 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb
@@ -8,24 +8,24 @@ PR = "${INC_PR}.1"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
-	file://enable-epson.patch;patch=1 \
-        file://fix_default_mode.patch;patch=1 \
-	file://enable-xcalibrate.patch;patch=1 \
-	file://hide-cursor-and-ppm-root.patch;patch=1 \
-	file://xcalibrate_coords.patch;patch=1 \
-	file://w100.patch;patch=1 \
-	file://w100-autofoo.patch;patch=1 \
-	file://w100-fix-offscreen-bmp.patch;patch=1 \
-	file://w100-new-input-world-order.patch;patch=1 \
-	file://linux-keyboard-mediumraw.patch;patch=1 \
-	file://xcalibrate-new-input-world-order.patch;patch=1 \
-	file://tslib-default-device.patch;patch=1 \
-	file://fbdev-evdev.patch;patch=1 \
-	file://keyboard-resume-workaround.patch;patch=1 \
-	file://xorg-avr32-support.diff;patch=1 \
-	file://pkgconfig_fix.patch;patch=1 \
-        file://no_xkb.patch;patch=1;pnum=0 \
-	file://vm86_masks.patch;patch=1 \
+	file://enable-epson.patch;apply=yes \
+        file://fix_default_mode.patch;apply=yes \
+	file://enable-xcalibrate.patch;apply=yes \
+	file://hide-cursor-and-ppm-root.patch;apply=yes \
+	file://xcalibrate_coords.patch;apply=yes \
+	file://w100.patch;apply=yes \
+	file://w100-autofoo.patch;apply=yes \
+	file://w100-fix-offscreen-bmp.patch;apply=yes \
+	file://w100-new-input-world-order.patch;apply=yes \
+	file://linux-keyboard-mediumraw.patch;apply=yes \
+	file://xcalibrate-new-input-world-order.patch;apply=yes \
+	file://tslib-default-device.patch;apply=yes \
+	file://fbdev-evdev.patch;apply=yes \
+	file://keyboard-resume-workaround.patch;apply=yes \
+	file://xorg-avr32-support.diff;apply=yes \
+	file://pkgconfig_fix.patch;apply=yes \
+        file://no_xkb.patch;apply=yes;striplevel=0 \
+	file://vm86_masks.patch;apply=yes \
         "
 
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb
index e658b316b0..d35fb711ba 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb
@@ -10,22 +10,22 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
-	file://enable-epson.patch;patch=1 \
-        file://fix_default_mode.patch;patch=1 \
-#	file://hide-cursor-and-ppm-root.patch;patch=1 \
-#	file://xcalibrate_coords.patch;patch=1 \
-	file://w100.patch;patch=1 \
-	file://w100-autofoo.patch;patch=1 \
-	file://w100-fix-offscreen-bmp.patch;patch=1 \
-	file://w100-new-input-world-order.patch;patch=1 \
-	file://linux-keyboard-mediumraw.patch;patch=1 \
-	file://xcalibrate-new-input-world-order.patch;patch=1 \
-	file://tslib-default-device.patch;patch=1 \
-#	file://fbdev-evdev.patch;patch=1 \
-	file://keyboard-resume-workaround.patch;patch=1 \
-	file://xorg-avr32-support.diff;patch=1 \
-#	file://pkgconfig_fix.patch;patch=1 \
-	file://no_xkb.patch;patch=1;pnum=0 \
+	file://enable-epson.patch;apply=yes \
+        file://fix_default_mode.patch;apply=yes \
+#	file://hide-cursor-and-ppm-root.patch;apply=yes \
+#	file://xcalibrate_coords.patch;apply=yes \
+	file://w100.patch;apply=yes \
+	file://w100-autofoo.patch;apply=yes \
+	file://w100-fix-offscreen-bmp.patch;apply=yes \
+	file://w100-new-input-world-order.patch;apply=yes \
+	file://linux-keyboard-mediumraw.patch;apply=yes \
+	file://xcalibrate-new-input-world-order.patch;apply=yes \
+	file://tslib-default-device.patch;apply=yes \
+#	file://fbdev-evdev.patch;apply=yes \
+	file://keyboard-resume-workaround.patch;apply=yes \
+	file://xorg-avr32-support.diff;apply=yes \
+#	file://pkgconfig_fix.patch;apply=yes \
+	file://no_xkb.patch;apply=yes;striplevel=0 \
         "
 
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.bb
index f01de6ef26..648b0a3cc5 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.4.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.4.bb
@@ -8,22 +8,22 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
-	file://enable-epson.patch;patch=1 \
-        file://fix_default_mode.patch;patch=1 \
-	file://enable-xcalibrate.patch;patch=1 \
-	file://hide-cursor-and-ppm-root.patch;patch=1 \
-	file://xcalibrate_coords.patch;patch=1 \
-	file://w100.patch;patch=1 \
-	file://w100-autofoo.patch;patch=1 \
-	file://w100-fix-offscreen-bmp.patch;patch=1 \
-	file://w100-new-input-world-order.patch;patch=1 \
-	file://linux-keyboard-mediumraw.patch;patch=1 \
-	file://xcalibrate-new-input-world-order.patch;patch=1 \
-	file://tslib-default-device.patch;patch=1 \
-	file://fbdev-evdev.patch;patch=1 \
-	file://keyboard-resume-workaround.patch;patch=1 \
-	file://xorg-avr32-support.diff;patch=1 \
-	file://pkgconfig_fix.patch;patch=1 \
+	file://enable-epson.patch;apply=yes \
+        file://fix_default_mode.patch;apply=yes \
+	file://enable-xcalibrate.patch;apply=yes \
+	file://hide-cursor-and-ppm-root.patch;apply=yes \
+	file://xcalibrate_coords.patch;apply=yes \
+	file://w100.patch;apply=yes \
+	file://w100-autofoo.patch;apply=yes \
+	file://w100-fix-offscreen-bmp.patch;apply=yes \
+	file://w100-new-input-world-order.patch;apply=yes \
+	file://linux-keyboard-mediumraw.patch;apply=yes \
+	file://xcalibrate-new-input-world-order.patch;apply=yes \
+	file://tslib-default-device.patch;apply=yes \
+	file://fbdev-evdev.patch;apply=yes \
+	file://keyboard-resume-workaround.patch;apply=yes \
+	file://xorg-avr32-support.diff;apply=yes \
+	file://pkgconfig_fix.patch;apply=yes \
         "
 
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb b/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
index af9ebbe53a..39fed5c4b4 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
@@ -10,15 +10,15 @@ PR = "${INC_PR}.0"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
-	file://enable-epson.patch;patch=1 \
-        file://fix_default_mode.patch;patch=1 \
-	file://linux-keyboard-mediumraw.patch;patch=1 \
-	file://xcalibrate-new-input-world-order.patch;patch=1 \
-	file://tslib-default-device.patch;patch=1 \
-	file://keyboard-resume-workaround.patch;patch=1 \
-	file://xorg-avr32-support.diff;patch=1 \
-    file://sysroot_fix.patch;patch=1 \
-    file://drmfix.patch;patch=1 \
+	file://enable-epson.patch;apply=yes \
+        file://fix_default_mode.patch;apply=yes \
+	file://linux-keyboard-mediumraw.patch;apply=yes \
+	file://xcalibrate-new-input-world-order.patch;apply=yes \
+	file://tslib-default-device.patch;apply=yes \
+	file://keyboard-resume-workaround.patch;apply=yes \
+	file://xorg-avr32-support.diff;apply=yes \
+    file://sysroot_fix.patch;apply=yes \
+    file://drmfix.patch;apply=yes \
         "
 
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/recipes/xorg-xserver/xserver-kdrive_git.bb b/recipes/xorg-xserver/xserver-kdrive_git.bb
index 7311fdcc6b..eed96a359c 100644
--- a/recipes/xorg-xserver/xserver-kdrive_git.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_git.bb
@@ -12,20 +12,20 @@ PR = "${INC_PR}.0"
 FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-git:${FILE_DIRNAME}/xserver-kdrive"
 SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \
 	${KDRIVE_COMMON_PATCHES} \
-	file://enable-epson.patch;patch=1 \
-	file://fix_default_mode.patch;patch=1 \
-	file://enable-xcalibrate.patch;patch=1 \
-	file://hide-cursor-and-ppm-root.patch;patch=1 \
-	file://xcalibrate_coords.patch;patch=1 \
-	file://w100.patch;patch=1 \
-	file://w100-autofoo.patch;patch=1 \
-	file://w100-fix-offscreen-bmp.patch;patch=1 \
-	file://w100-new-input-world-order.patch;patch=1 \
-	file://w100-post-1.4-buildfix.patch;patch=1 \
-	file://xcalibrate-new-input-world-order.patch;patch=1 \
-	file://tslib-default-device.patch;patch=1 \
-	file://fbdev-evdev.patch;patch=1 \
-	file://xephyr-post-1.4-buildfix.patch;patch=1 \
+	file://enable-epson.patch;apply=yes \
+	file://fix_default_mode.patch;apply=yes \
+	file://enable-xcalibrate.patch;apply=yes \
+	file://hide-cursor-and-ppm-root.patch;apply=yes \
+	file://xcalibrate_coords.patch;apply=yes \
+	file://w100.patch;apply=yes \
+	file://w100-autofoo.patch;apply=yes \
+	file://w100-fix-offscreen-bmp.patch;apply=yes \
+	file://w100-new-input-world-order.patch;apply=yes \
+	file://w100-post-1.4-buildfix.patch;apply=yes \
+	file://xcalibrate-new-input-world-order.patch;apply=yes \
+	file://tslib-default-device.patch;apply=yes \
+	file://fbdev-evdev.patch;apply=yes \
+	file://xephyr-post-1.4-buildfix.patch;apply=yes \
 	"
 
 S = "${WORKDIR}/git"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.2.0.bb b/recipes/xorg-xserver/xserver-xorg_1.2.0.bb
index d3b9dde754..f0f82bf0c3 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.2.0.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.2.0.bb
@@ -10,6 +10,6 @@ export LDFLAGS += " -ldl "
 
 #DEPENDS += " "
 
-SRC_URI += "file://report-correct-randr10.patch;patch=1"
+SRC_URI += "file://report-correct-randr10.patch;apply=yes"
 SRC_URI[archive.md5sum] = "ea291c89e68832d570d9d5e007218bd6"
 SRC_URI[archive.sha256sum] = "e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb b/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb
index fadcd0d8bd..2a78168c81 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb
@@ -4,9 +4,9 @@ require xorg-xserver-common.inc
 PE = "1"
 PR = "${INC_PR}.1"
 
-SRC_URI += "file://drmfix.patch;patch=1 \
-            file://glyphstr.patch;patch=1 \
-            file://report-correct-randr12.patch;patch=1"
+SRC_URI += "file://drmfix.patch;apply=yes \
+            file://glyphstr.patch;apply=yes \
+            file://report-correct-randr12.patch;apply=yes"
 
 export LDFLAGS += " -ldl "
 
diff --git a/recipes/xorg-xserver/xserver-xorg_1.4.2.bb b/recipes/xorg-xserver/xserver-xorg_1.4.2.bb
index cc33b3cf0b..c1b8530956 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.4.2.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.4.2.bb
@@ -6,9 +6,9 @@ RDEPENDS += "hal"
 PE = "1"
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://drmfix.patch;patch=1 \
-            file://pkgconfig_fix.patch;patch=1 \
-            file://sysroot_fix.patch;patch=1 \
+SRC_URI += "file://drmfix.patch;apply=yes \
+            file://pkgconfig_fix.patch;apply=yes \
+            file://sysroot_fix.patch;apply=yes \
             file://xcalibrate-xorg.diff \
 "
 
diff --git a/recipes/xorg-xserver/xserver-xorg_1.4.bb b/recipes/xorg-xserver/xserver-xorg_1.4.bb
index 8d0fa884be..0203996e85 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.4.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.4.bb
@@ -6,9 +6,9 @@ RDEPENDS += "hal"
 PE = "1"
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://drmfix.patch;patch=1 \
-            file://pkgconfig_fix.patch;patch=1 \
-            file://sysroot_fix.patch;patch=1"
+SRC_URI += "file://drmfix.patch;apply=yes \
+            file://pkgconfig_fix.patch;apply=yes \
+            file://sysroot_fix.patch;apply=yes"
 
 MESA_VER = "7.0.2"
 
diff --git a/recipes/xorg-xserver/xserver-xorg_1.5.1.bb b/recipes/xorg-xserver/xserver-xorg_1.5.1.bb
index db30fbeeda..be9dcb5132 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.5.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.5.1.bb
@@ -6,8 +6,8 @@ RDEPENDS += "hal"
 PE = "1"
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://drmfix.patch;patch=1 \
-            file://sysroot_fix.patch;patch=1"
+SRC_URI += "file://drmfix.patch;apply=yes \
+            file://sysroot_fix.patch;apply=yes"
 
 MESA_VER = "7.2"
 
diff --git a/recipes/xorg-xserver/xserver-xorg_1.5.3.bb b/recipes/xorg-xserver/xserver-xorg_1.5.3.bb
index 3a8ef9a22d..925cecafe0 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.5.3.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.5.3.bb
@@ -6,11 +6,11 @@ RDEPENDS += "hal"
 PE = "2"
 PR = "${INC_PR}.1"
 
-SRC_URI += "file://drmfix.patch;patch=1 \
-            file://sysroot_fix.patch;patch=1 \
-            file://xorg-avr32-support.diff;patch=1 \
-	    file://xorg-server-1.5.3-configure.patch;patch=1 \
-	    file://xorg-server-1.5.3-glcore-prepare-for-dynamic.patch;patch=1 \
+SRC_URI += "file://drmfix.patch;apply=yes \
+            file://sysroot_fix.patch;apply=yes \
+            file://xorg-avr32-support.diff;apply=yes \
+	    file://xorg-server-1.5.3-configure.patch;apply=yes \
+	    file://xorg-server-1.5.3-glcore-prepare-for-dynamic.patch;apply=yes \
 "
 
 MESA_VER = "7.2"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.1.bb b/recipes/xorg-xserver/xserver-xorg_1.7.1.bb
index 14d1a20ab1..0be0cdae21 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.7.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.1.bb
@@ -5,9 +5,9 @@ DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
 PE = "2"
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://sysroot_fix.patch;patch=1 \
-            file://dolt-fix-1.7.0.patch;patch=1 \
-            file://randr-support-1.7.0.patch;patch=1 \
+SRC_URI += "file://sysroot_fix.patch;apply=yes \
+            file://dolt-fix-1.7.0.patch;apply=yes \
+            file://randr-support-1.7.0.patch;apply=yes \
            "
 do_install_prepend() {
         mkdir -p ${D}/${libdir}/X11/fonts
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.4.bb b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb
index 3424784805..e90d84c1f5 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.7.4.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb
@@ -5,14 +5,14 @@ DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
 PE = "2"
 PR = "${INC_PR}.1"
 
-SRC_URI += "file://sysroot_fix.patch;patch=1 \
-            file://dolt-fix-1.7.0.patch;patch=1 \
-            file://randr-support-1.7.0.patch;patch=1 \
-	    file://hack-fbdev-ignore-return-mode.patch;patch=1 \
+SRC_URI += "file://sysroot_fix.patch;apply=yes \
+            file://dolt-fix-1.7.0.patch;apply=yes \
+            file://randr-support-1.7.0.patch;apply=yes \
+	    file://hack-fbdev-ignore-return-mode.patch;apply=yes \
            "
 
-SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
-SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
+SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;apply=yes"
+SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch;apply=yes"
 
 do_install_prepend() {
         mkdir -p ${D}/${libdir}/X11/fonts
diff --git a/recipes/xorg-xserver/xserver-xorg_1.8.0.bb b/recipes/xorg-xserver/xserver-xorg_1.8.0.bb
index dc0cc52430..6a1a4ecb25 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.8.0.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.8.0.bb
@@ -13,15 +13,15 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_shr = "1"
 
 SRC_URI += " \
-            file://dolt-fix-1.7.0.patch;patch=1 \
-            file://randr-support-1.7.0.patch;patch=1 \
-	    file://hack-fbdev-ignore-return-mode.patch;patch=1 \
+            file://dolt-fix-1.7.0.patch;apply=yes \
+            file://randr-support-1.7.0.patch;apply=yes \
+	    file://hack-fbdev-ignore-return-mode.patch;apply=yes \
            "
 SRC_URI[archive.md5sum] = "7cec3a11890bb53f4a07854319360348"
 SRC_URI[archive.sha256sum] = "423a8092e28affb83aa736695408e01fd4641040727f34ed6bcfae9c06018b77"
 
-SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
-SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
+SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;apply=yes"
+SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch;apply=yes"
 
 do_install_prepend() {
         mkdir -p ${D}/${libdir}/X11/fonts
diff --git a/recipes/xorg-xserver/xserver-xorg_1.8.1.bb b/recipes/xorg-xserver/xserver-xorg_1.8.1.bb
index d3df4c3a18..72fb845869 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.8.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.8.1.bb
@@ -13,15 +13,15 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_shr = "1"
 
 SRC_URI += " \
-            file://dolt-fix-1.7.0.patch;patch=1 \
-            file://randr-support-1.7.0.patch;patch=1 \
-	    file://hack-fbdev-ignore-return-mode.patch;patch=1 \
+            file://dolt-fix-1.7.0.patch;apply=yes \
+            file://randr-support-1.7.0.patch;apply=yes \
+	    file://hack-fbdev-ignore-return-mode.patch;apply=yes \
            "
 SRC_URI[archive.md5sum] = "7c3b873692f4e93938261d774510e78d"
 SRC_URI[archive.sha256sum] = "bddb974d8f21107ab8f79abf92cebb06ec13243f1ffd1ef56b48452c4994659d"
 
-SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
-SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
+SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;apply=yes"
+SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch;apply=yes"
 
 do_install_prepend() {
         mkdir -p ${D}/${libdir}/X11/fonts
diff --git a/recipes/xorg-xserver/xserver-xorg_cvs.bb b/recipes/xorg-xserver/xserver-xorg_cvs.bb
index c120dc713d..8b115a1e69 100644
--- a/recipes/xorg-xserver/xserver-xorg_cvs.bb
+++ b/recipes/xorg-xserver/xserver-xorg_cvs.bb
@@ -7,8 +7,8 @@ PV = "6.8.1+cvs${SRCDATE}"
 DEPENDS = "fontconfig freetype libxi libxmu flex-2.5.4-native"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver \
-	file://imake-staging.patch;patch=1 \
-	file://dri.patch;patch=1"
+	file://imake-staging.patch;apply=yes \
+	file://dri.patch;apply=yes"
 
 PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils"
 
diff --git a/recipes/xorg-xserver/xserver-xorg_git.bb b/recipes/xorg-xserver/xserver-xorg_git.bb
index 20c8b09c58..12a895fdb4 100644
--- a/recipes/xorg-xserver/xserver-xorg_git.bb
+++ b/recipes/xorg-xserver/xserver-xorg_git.bb
@@ -11,9 +11,9 @@ DEFAULT_PREFERENCE = "-1"
 
 SRCREV = "67b814d9b2baea6beccfb1625a1e3f0b2ba7218b"
 SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=master \
-           file://dolt-fix-1.7.0.patch;patch=1 \
-           file://randr-support-1.7.0.patch;patch=1 \
-	   file://hack-fbdev-ignore-return-mode.patch;patch=1 \
+           file://dolt-fix-1.7.0.patch;apply=yes \
+           file://randr-support-1.7.0.patch;apply=yes \
+	   file://hack-fbdev-ignore-return-mode.patch;apply=yes \
            "
 
 S = "${WORKDIR}/git"