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>

16 files changed, 363 insertions, 363 deletions

diff --git a/recipes/glibc/glibc_2.10.1.bb b/recipes/glibc/glibc_2.10.1.bb
index 3db617b17e..0ebba4b156 100644
--- a/recipes/glibc/glibc_2.10.1.bb
+++ b/recipes/glibc/glibc_2.10.1.bb
@@ -37,34 +37,34 @@ RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2;name=archive \
 	   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2;name=ports \
 	   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2;name=libidn \
-	   file://nscd-init.patch;patch=1;pnum=0 \
-           file://arm-memcpy.patch;patch=1 \
-           file://arm-longlong.patch;patch=1 \
-           file://fhs-linux-paths.patch;patch=1 \
-           file://dl-cache-libcmp.patch;patch=1 \
-           file://ldsocache-varrun.patch;patch=1 \
-           file://nptl-crosscompile.patch;patch=1 \
-	   file://glibc-check_pf.patch;patch=1;pnum=0 \
-           file://ldd-unbash.patch;patch=1 \
-	   file://glibc-arm-IO-acquire-lock-fix.diff;patch=1 \
+	   file://nscd-init.patch;apply=yes;striplevel=0 \
+           file://arm-memcpy.patch;apply=yes \
+           file://arm-longlong.patch;apply=yes \
+           file://fhs-linux-paths.patch;apply=yes \
+           file://dl-cache-libcmp.patch;apply=yes \
+           file://ldsocache-varrun.patch;apply=yes \
+           file://nptl-crosscompile.patch;apply=yes \
+	   file://glibc-check_pf.patch;apply=yes;striplevel=0 \
+           file://ldd-unbash.patch;apply=yes \
+	   file://glibc-arm-IO-acquire-lock-fix.diff;apply=yes \
 	   file://generic-bits_select.h \
 	   file://generic-bits_types.h \
 	   file://generic-bits_typesizes.h \
 	   file://generic-bits_time.h \
            file://etc/ld.so.conf \
            file://generate-supported.mk \
-           file://march-i686.patch;patch=1;pnum=0 \
-           file://arm-lowlevellock-include-tls.patch;patch=1 \
-           file://glibc-2.9-enable-binutils-2.2.patch;patch=1 \
-	   file://armv4t-interworking.patch;patch=1 \
+           file://march-i686.patch;apply=yes;striplevel=0 \
+           file://arm-lowlevellock-include-tls.patch;apply=yes \
+           file://glibc-2.9-enable-binutils-2.2.patch;apply=yes \
+	   file://armv4t-interworking.patch;apply=yes \
            "
 
 # Build fails on sh3 and sh4 without additional patches
-SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
+SRC_URI_append_sh3 = " file://no-z-defs.patch;apply=yes"
+SRC_URI_append_sh4 = " file://no-z-defs.patch;apply=yes"
 
 #powerpc patches to add support for soft-float
-SRC_URI_append_powerpc= " file://powerpc-sqrt-hack.diff;patch=1"
+SRC_URI_append_powerpc= " file://powerpc-sqrt-hack.diff;apply=yes"
 
 S = "${WORKDIR}/glibc-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.2.5.bb b/recipes/glibc/glibc_2.2.5.bb
index a1c00e7d4b..1c164f6a8e 100644
--- a/recipes/glibc/glibc_2.2.5.bb
+++ b/recipes/glibc/glibc_2.2.5.bb
@@ -42,68 +42,68 @@ FILES_localedef = "${bindir}/localedef"
 RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
 RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev"
 
-#	   file://noinfo.patch;patch=1 \
-#	   file://ldconfig.patch;patch=1;pnum=0 \
+#	   file://noinfo.patch;apply=yes \
+#	   file://ldconfig.patch;apply=yes;striplevel=0 \
 
 SRC_URI = "${GNU_MIRROR}/glibc/glibc-${PV}.tar.gz;name=archive \
 	   ${GNU_MIRROR}/glibc/glibc-linuxthreads-${PV}.tar.gz;name=linuxthreads \
-	   file://alpha-build-failure.patch;patch=1 \
-	   file://arm-asm-clobber.patch;patch=1 \
-	   file://arm-ctl_bus_isa.patch;patch=1 \
-	   file://cris-libc-symbols.patch;patch=1 \
-	   file://cris-stack-direction.patch;patch=1 \
-	   file://dl-machine-alpha.patch;patch=1 \
-	   file://dl-machine-arm.patch;patch=1 \
-	   file://dl-machine-m68k.patch;patch=1 \
-	   file://dl-machine-mips.patch;patch=1 \
-	   file://dl-machine-sh.patch;patch=1 \
-	   file://dl-machine-sparc.patch;patch=1 \
-	   file://errlist-1.9.patch;patch=1 \
-	   file://errlist-arm.patch;patch=1 \
-	   file://glibc-2.2.5-allow-gcc-3.4-fixup.patch;patch=1 \
-	   file://glibc-2.2.5-allow-gcc-3.4-grp.patch;patch=1 \
-	   file://glibc-2.2.5-allow-gcc-4.x-configure.patch;patch=1 \
-	   file://glibc-2.2.5-alpha-pwrite64.patch;patch=1 \
-	   file://glibc-2.2.5-arm-pwrite64.patch;patch=1 \
-	   file://glibc-2.2.5-crosstest.patch;patch=1 \
-	   file://glibc-2.2.5-crossyes.patch;patch=1 \
-	   file://glibc-2.2.5-cygwin.patch;patch=1 \
-	   file://glibc-2.2.5-hhl-powerpc-fpu.patch;patch=1 \
-	   file://glibc-2.2.5-mips-build-gmon.patch;patch=1 \
-	   file://glibc-2.2.5-mips-clone-local-label.patch;patch=1 \
-	   file://glibc-2.2.5-ppc405erratum77.patch;patch=1 \
-	   file://glibc-drow-sh.patch;patch=1 \
-	   file://glibc-test-lowram.patch;patch=1 \
-	   file://initfini-alpha.patch;patch=1 \
-	   file://initfini-sh.patch;patch=1 \
-	   file://longjmp-sparc.patch;patch=1 \
-	   file://sh-setjmp-fix.patch;patch=1 \
-	   file://sprintf-prototype.patch;patch=1 \
-	   file://sscanf.patch;patch=1 \
-	   file://unwind-arm.patch;patch=1 \
-	   file://ldd.patch;patch=1;pnum=0 \
-	   file://fhs-linux-paths.patch;patch=1;pnum=1 \
-	   file://arm-no-hwcap.patch;patch=1;pnum=0 \
-	   file://arm-memcpy.patch;patch=1;pnum=0 \
-	   file://arm-longlong.patch;patch=1;pnum=0 \
-	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
-	   file://glibc-2.2.5-allow-gcc-3.4-td.patch;patch=1 \
-	   file://glibc-2.2.5-alpha-self-clobber.patch;patch=1 \
-	   file://pt-initfini-alpha.patch;patch=1 \
-	   file://pt-initfini-sh.patch;patch=1 \
-	   file://linuxthreads-2.2.5-ppc405erratum77.patch;patch=1 \
-	   file://threadparam.patch;patch=1 \
-	   file://initfini-flags.patch;patch=1 \
-	   file://pt-initfini-flags.patch;patch=1 \
-	   file://glibc-2.3.2-allow-solaris.patch;patch=1 \
+	   file://alpha-build-failure.patch;apply=yes \
+	   file://arm-asm-clobber.patch;apply=yes \
+	   file://arm-ctl_bus_isa.patch;apply=yes \
+	   file://cris-libc-symbols.patch;apply=yes \
+	   file://cris-stack-direction.patch;apply=yes \
+	   file://dl-machine-alpha.patch;apply=yes \
+	   file://dl-machine-arm.patch;apply=yes \
+	   file://dl-machine-m68k.patch;apply=yes \
+	   file://dl-machine-mips.patch;apply=yes \
+	   file://dl-machine-sh.patch;apply=yes \
+	   file://dl-machine-sparc.patch;apply=yes \
+	   file://errlist-1.9.patch;apply=yes \
+	   file://errlist-arm.patch;apply=yes \
+	   file://glibc-2.2.5-allow-gcc-3.4-fixup.patch;apply=yes \
+	   file://glibc-2.2.5-allow-gcc-3.4-grp.patch;apply=yes \
+	   file://glibc-2.2.5-allow-gcc-4.x-configure.patch;apply=yes \
+	   file://glibc-2.2.5-alpha-pwrite64.patch;apply=yes \
+	   file://glibc-2.2.5-arm-pwrite64.patch;apply=yes \
+	   file://glibc-2.2.5-crosstest.patch;apply=yes \
+	   file://glibc-2.2.5-crossyes.patch;apply=yes \
+	   file://glibc-2.2.5-cygwin.patch;apply=yes \
+	   file://glibc-2.2.5-hhl-powerpc-fpu.patch;apply=yes \
+	   file://glibc-2.2.5-mips-build-gmon.patch;apply=yes \
+	   file://glibc-2.2.5-mips-clone-local-label.patch;apply=yes \
+	   file://glibc-2.2.5-ppc405erratum77.patch;apply=yes \
+	   file://glibc-drow-sh.patch;apply=yes \
+	   file://glibc-test-lowram.patch;apply=yes \
+	   file://initfini-alpha.patch;apply=yes \
+	   file://initfini-sh.patch;apply=yes \
+	   file://longjmp-sparc.patch;apply=yes \
+	   file://sh-setjmp-fix.patch;apply=yes \
+	   file://sprintf-prototype.patch;apply=yes \
+	   file://sscanf.patch;apply=yes \
+	   file://unwind-arm.patch;apply=yes \
+	   file://ldd.patch;apply=yes;striplevel=0 \
+	   file://fhs-linux-paths.patch;apply=yes \
+	   file://arm-no-hwcap.patch;apply=yes;striplevel=0 \
+	   file://arm-memcpy.patch;apply=yes;striplevel=0 \
+	   file://arm-longlong.patch;apply=yes;striplevel=0 \
+	   file://arm-machine-gmon.patch;apply=yes;striplevel=0 \
+	   file://glibc-2.2.5-allow-gcc-3.4-td.patch;apply=yes \
+	   file://glibc-2.2.5-alpha-self-clobber.patch;apply=yes \
+	   file://pt-initfini-alpha.patch;apply=yes \
+	   file://pt-initfini-sh.patch;apply=yes \
+	   file://linuxthreads-2.2.5-ppc405erratum77.patch;apply=yes \
+	   file://threadparam.patch;apply=yes \
+	   file://initfini-flags.patch;apply=yes \
+	   file://pt-initfini-flags.patch;apply=yes \
+	   file://glibc-2.3.2-allow-solaris.patch;apply=yes \
 	   \
            file://etc/ld.so.conf \
 	   file://generate-supported.mk"
-#	   file://makeconfig.patch;patch=1;pnum=0
+#	   file://makeconfig.patch;apply=yes;striplevel=0
 
 
 # seems to break on TLS platforms
-# SRC_URI_append_arm = " file://dyn-ldconfig.patch;patch=1;pnum=0"
+# SRC_URI_append_arm = " file://dyn-ldconfig.patch;apply=yes;striplevel=0"
 
 S = "${WORKDIR}/glibc-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.3.2+cvs20040726.bb b/recipes/glibc/glibc_2.3.2+cvs20040726.bb
index 7773e9cd52..674c96e4af 100644
--- a/recipes/glibc/glibc_2.3.2+cvs20040726.bb
+++ b/recipes/glibc/glibc_2.3.2+cvs20040726.bb
@@ -7,26 +7,26 @@ PR = "${INC_PR}.0"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
-#	   file://noinfo.patch;patch=1
-#	   file://ldconfig.patch;patch=1;pnum=0
+#	   file://noinfo.patch;apply=yes
+#	   file://ldconfig.patch;apply=yes;striplevel=0
 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \
-	   file://arm-ioperm.patch;patch=1;pnum=0 \
-	   file://makeconfig.patch;patch=1;pnum=0 \
-	   file://ldd.patch;patch=1;pnum=0 \
-	   file://fhs-linux-paths.patch;patch=1 \
-	   file://arm-no-hwcap.patch;patch=1;pnum=0 \
-	   file://arm-memcpy.patch;patch=1;pnum=0 \
-	   file://arm-longlong.patch;patch=1;pnum=0 \
-	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
-	   file://glibc-fp-byteorder.patch;patch=1 \
+	   file://arm-ioperm.patch;apply=yes;striplevel=0 \
+	   file://makeconfig.patch;apply=yes;striplevel=0 \
+	   file://ldd.patch;apply=yes;striplevel=0 \
+	   file://fhs-linux-paths.patch;apply=yes \
+	   file://arm-no-hwcap.patch;apply=yes;striplevel=0 \
+	   file://arm-memcpy.patch;apply=yes;striplevel=0 \
+	   file://arm-longlong.patch;apply=yes;striplevel=0 \
+	   file://arm-machine-gmon.patch;apply=yes;striplevel=0 \
+	   file://glibc-fp-byteorder.patch;apply=yes \
 	   \
            file://etc/ld.so.conf \
 	   file://generate-supported.mk"
 
 # seems to fail on tls platforms
-SRC_URI_append_arm = " file://dyn-ldconfig.patch;patch=1;pnum=0"
+SRC_URI_append_arm = " file://dyn-ldconfig.patch;apply=yes;striplevel=0"
 
-SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1"
+SRC_URI_append_openmn = " file://ldsocache-varrun.patch;apply=yes"
 
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.3.2.bb b/recipes/glibc/glibc_2.3.2.bb
index 6c8c6a5f1f..e9c5457f14 100644
--- a/recipes/glibc/glibc_2.3.2.bb
+++ b/recipes/glibc/glibc_2.3.2.bb
@@ -43,71 +43,71 @@ RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz;name=archive \
 	   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-2.3.2.tar.gz;name=linuxthreads \
-	   file://noinfo.patch;patch=1 \
-	   file://10_cvs.patch;patch=1 \
- 	   file://arm-ioperm.patch;patch=1;pnum=0 \
-	   file://glibc-i686-timing.patch;patch=1;pnum=1 \
- 	   file://makeconfig.patch;patch=1;pnum=0 \
-	   file://locale-es_AR.patch;patch=1;pnum=0 \
-	   file://ldconfig.patch;patch=1;pnum=0 \
- 	   file://ldd.patch;patch=1;pnum=0 \
- 	   file://fhs-linux-paths.patch;patch=1;pnum=1 \
-	   file://glibc22-nss-upgrade.patch;patch=1;pnum=1 \
-	   file://glibc22-eo_EO.patch;patch=1;pnum=1 \
-	   file://glibc22-m68k-compat.patch;patch=1;pnum=1 \
-	   file://glibc22-m68k-fpic.patch;patch=1;pnum=1 \
-	   file://glibc22-locales.patch;patch=1;pnum=0 \
-	   file://sparc64-fixups.patch;patch=1;pnum=1 \
-	   file://glibc22-ttyname-devfs.patch;patch=1;pnum=0 \
-	   file://powerpc-sysconf.patch;patch=1;pnum=1 \
- 	   file://arm-no-hwcap.patch;patch=1;pnum=0 \
-	   file://locales-stuff.patch;patch=1;pnum=1 \
-	   file://librt-mips.patch;patch=1;pnum=0 \
-	   file://glibc23-ctype-compat.patch;patch=1;pnum=1 \
-	   file://glibc23-hppa-Rminkernel.patch;patch=1;pnum=0 \
-	   file://glibc23-function-compat.patch;patch=1;pnum=1 \
-	   file://glibc23-errno.patch;patch=1;pnum=1 \
-	   file://glibc23-asserth-decls.patch;patch=1;pnum=0 \
-	   file://alpha-pic.patch;patch=1;pnum=0 \
-	   file://glibc23-cmov.patch;patch=1;pnum=1 \
-	   file://libgcc-compat-all.patch;patch=1;pnum=0 \
-	   file://locales-supported.patch;patch=1;pnum=0 \
-	   file://libgcc-compat-other.patch;patch=1;pnum=1 \
-	   file://s390-tls.patch;patch=1;pnum=0 \
-	   file://hurd-enable-ldconfig.patch;patch=1;pnum=1 \
-	   file://30_glibc232-base.patch;patch=1;pnum=0 \
-	   file://sparcv8-target.patch;patch=1;pnum=0 \
-	   file://50_glibc232-arm-dwarf2-buildfix.patch;patch=1;pnum=0 \
-	   file://50_glibc232-m68k-dwarf2-buildfix.patch;patch=1;pnum=1 \
-	   file://arm-output-format.patch;patch=1;pnum=0 \
-	   file://pthread-cleanup.patch;patch=1;pnum=0 \
-	   file://glibc-${PV}-ldconfig-tls.patch;patch=1;pnum=1 \
-	   file://glibc23-mips-msq.patch;patch=1;pnum=0 \
-	   file://glibc23-libio-compat.patch;patch=1;pnum=1 \
-	   file://80_glibc232-locales-nb_NO-fix.patch;patch=1;pnum=0 \
-	   file://ldso-disable-hwcap.patch;patch=1;pnum=1 \
-	   file://11_shlib-lds.patch;patch=1;pnum=1 \
-	   file://glibc23-version-sanity.patch;patch=1;pnum=1 \
-	   file://glibc23-sse-oldkernel.patch;patch=1;pnum=1 \
-	   file://glibc23-sparc-pread64.patch;patch=1;pnum=1 \
-	   file://glibc23-powerpc-sigcontext.patch;patch=1;pnum=1 \
-	   file://hppa-syscall.patch;patch=1;pnum=0 \
-	   file://glibc23-errno-hack.patch;patch=1;pnum=1 \
-	   file://90_glibc232-statvfs.patch;patch=1;pnum=0 \
-	   file://90_glibc232-timezones.patch;patch=1;pnum=0 \
- 	   file://arm-memcpy.patch;patch=1;pnum=0 \
- 	   file://arm-longlong.patch;patch=1;pnum=0 \
- 	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
-           file://dyn-ldconfig.diff;patch=1;pnum=0 \
-	   file://glibc232-gcc34-i386-fixup-attribute.patch;patch=1;pnum=1 \
-	   file://glibc232-gcc34-no-unit-at-a-time.patch;patch=1;pnum=1 \
+	   file://noinfo.patch;apply=yes \
+	   file://10_cvs.patch;apply=yes \
+ 	   file://arm-ioperm.patch;apply=yes;striplevel=0 \
+	   file://glibc-i686-timing.patch;apply=yes \
+ 	   file://makeconfig.patch;apply=yes;striplevel=0 \
+	   file://locale-es_AR.patch;apply=yes;striplevel=0 \
+	   file://ldconfig.patch;apply=yes;striplevel=0 \
+ 	   file://ldd.patch;apply=yes;striplevel=0 \
+ 	   file://fhs-linux-paths.patch;apply=yes \
+	   file://glibc22-nss-upgrade.patch;apply=yes \
+	   file://glibc22-eo_EO.patch;apply=yes \
+	   file://glibc22-m68k-compat.patch;apply=yes \
+	   file://glibc22-m68k-fpic.patch;apply=yes \
+	   file://glibc22-locales.patch;apply=yes;striplevel=0 \
+	   file://sparc64-fixups.patch;apply=yes \
+	   file://glibc22-ttyname-devfs.patch;apply=yes;striplevel=0 \
+	   file://powerpc-sysconf.patch;apply=yes \
+ 	   file://arm-no-hwcap.patch;apply=yes;striplevel=0 \
+	   file://locales-stuff.patch;apply=yes \
+	   file://librt-mips.patch;apply=yes;striplevel=0 \
+	   file://glibc23-ctype-compat.patch;apply=yes \
+	   file://glibc23-hppa-Rminkernel.patch;apply=yes;striplevel=0 \
+	   file://glibc23-function-compat.patch;apply=yes \
+	   file://glibc23-errno.patch;apply=yes \
+	   file://glibc23-asserth-decls.patch;apply=yes;striplevel=0 \
+	   file://alpha-pic.patch;apply=yes;striplevel=0 \
+	   file://glibc23-cmov.patch;apply=yes \
+	   file://libgcc-compat-all.patch;apply=yes;striplevel=0 \
+	   file://locales-supported.patch;apply=yes;striplevel=0 \
+	   file://libgcc-compat-other.patch;apply=yes \
+	   file://s390-tls.patch;apply=yes;striplevel=0 \
+	   file://hurd-enable-ldconfig.patch;apply=yes \
+	   file://30_glibc232-base.patch;apply=yes;striplevel=0 \
+	   file://sparcv8-target.patch;apply=yes;striplevel=0 \
+	   file://50_glibc232-arm-dwarf2-buildfix.patch;apply=yes;striplevel=0 \
+	   file://50_glibc232-m68k-dwarf2-buildfix.patch;apply=yes \
+	   file://arm-output-format.patch;apply=yes;striplevel=0 \
+	   file://pthread-cleanup.patch;apply=yes;striplevel=0 \
+	   file://glibc-${PV}-ldconfig-tls.patch;apply=yes \
+	   file://glibc23-mips-msq.patch;apply=yes;striplevel=0 \
+	   file://glibc23-libio-compat.patch;apply=yes \
+	   file://80_glibc232-locales-nb_NO-fix.patch;apply=yes;striplevel=0 \
+	   file://ldso-disable-hwcap.patch;apply=yes \
+	   file://11_shlib-lds.patch;apply=yes \
+	   file://glibc23-version-sanity.patch;apply=yes \
+	   file://glibc23-sse-oldkernel.patch;apply=yes \
+	   file://glibc23-sparc-pread64.patch;apply=yes \
+	   file://glibc23-powerpc-sigcontext.patch;apply=yes \
+	   file://hppa-syscall.patch;apply=yes;striplevel=0 \
+	   file://glibc23-errno-hack.patch;apply=yes \
+	   file://90_glibc232-statvfs.patch;apply=yes;striplevel=0 \
+	   file://90_glibc232-timezones.patch;apply=yes;striplevel=0 \
+ 	   file://arm-memcpy.patch;apply=yes;striplevel=0 \
+ 	   file://arm-longlong.patch;apply=yes;striplevel=0 \
+ 	   file://arm-machine-gmon.patch;apply=yes;striplevel=0 \
+           file://dyn-ldconfig.diff;apply=yes;striplevel=0 \
+	   file://glibc232-gcc34-i386-fixup-attribute.patch;apply=yes \
+	   file://glibc232-gcc34-no-unit-at-a-time.patch;apply=yes \
 	   file://etc/ld.so.conf \
  	   file://generate-supported.mk"
 
-SRC_URI_append_mtx-1 = " file://mips-abio32.patch;patch=1 \
-                         file://allow-gcc.patch;patch=1 "
-SRC_URI_append_mtx-2 = " file://mips-abio32.patch;patch=1 \
-                         file://allow-gcc.patch;patch=1 "
+SRC_URI_append_mtx-1 = " file://mips-abio32.patch;apply=yes \
+                         file://allow-gcc.patch;apply=yes "
+SRC_URI_append_mtx-2 = " file://mips-abio32.patch;apply=yes \
+                         file://allow-gcc.patch;apply=yes "
 
 S = "${WORKDIR}/glibc-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.3.3+cvs20041128.bb b/recipes/glibc/glibc_2.3.3+cvs20041128.bb
index f52bb07643..534b68403a 100644
--- a/recipes/glibc/glibc_2.3.3+cvs20041128.bb
+++ b/recipes/glibc/glibc_2.3.3+cvs20041128.bb
@@ -28,24 +28,24 @@ python __anonymous () {
                                    bb.data.getVar('TARGET_OS', d, 1))
 }
 
-#	   file://noinfo.patch;patch=1
-#	   file://ldconfig.patch;patch=1;pnum=0
+#	   file://noinfo.patch;apply=yes
+#	   file://ldconfig.patch;apply=yes;striplevel=0
 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \
-	   file://arm-ioperm.patch;patch=1;pnum=0 \
-	   file://ldd.patch;patch=1;pnum=0 \
-	   file://fhs-linux-paths.patch;patch=1 \
-	   file://arm-no-hwcap.patch;patch=1;pnum=0 \
-	   file://arm-memcpy.patch;patch=1;pnum=0 \
-	   file://arm-longlong.patch;patch=1;pnum=0 \
-	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
+	   file://arm-ioperm.patch;apply=yes;striplevel=0 \
+	   file://ldd.patch;apply=yes;striplevel=0 \
+	   file://fhs-linux-paths.patch;apply=yes \
+	   file://arm-no-hwcap.patch;apply=yes;striplevel=0 \
+	   file://arm-memcpy.patch;apply=yes;striplevel=0 \
+	   file://arm-longlong.patch;apply=yes;striplevel=0 \
+	   file://arm-machine-gmon.patch;apply=yes;striplevel=0 \
 	   \
            file://etc/ld.so.conf \
 	   file://generate-supported.mk"
 
 # seems to fail on tls platforms
-SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
+SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;apply=yes"
 
-SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1"
+SRC_URI_append_openmn = " file://ldsocache-varrun.patch;apply=yes"
 
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.3.3+cvs20050221.bb b/recipes/glibc/glibc_2.3.3+cvs20050221.bb
index 34efe71ed5..8db3f89aaf 100644
--- a/recipes/glibc/glibc_2.3.3+cvs20050221.bb
+++ b/recipes/glibc/glibc_2.3.3+cvs20050221.bb
@@ -12,25 +12,25 @@ DEFAULT_PREFERENCE_i686 = "0"
 DEFAULT_PREFERENCE_sh3 = "0"
 DEFAULT_PREFERENCE_sh4 = "0"
 
-#	   file://noinfo.patch;patch=1
-#	   file://ldconfig.patch;patch=1;pnum=0
+#	   file://noinfo.patch;apply=yes
+#	   file://ldconfig.patch;apply=yes;striplevel=0
 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \
-	   file://arm-ioperm.patch;patch=1;pnum=0 \
-	   file://fhs-linux-paths.patch;patch=1 \
-	   file://arm-no-hwcap.patch;patch=1;pnum=0 \
-	   file://arm-memcpy.patch;patch=1;pnum=0 \
-	   file://arm-longlong.patch;patch=1;pnum=0 \
-	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
-	   file://trampoline.patch;patch=1;pnum=0 \
-	   file://dl-cache-libcmp.patch;patch=1 \
+	   file://arm-ioperm.patch;apply=yes;striplevel=0 \
+	   file://fhs-linux-paths.patch;apply=yes \
+	   file://arm-no-hwcap.patch;apply=yes;striplevel=0 \
+	   file://arm-memcpy.patch;apply=yes;striplevel=0 \
+	   file://arm-longlong.patch;apply=yes;striplevel=0 \
+	   file://arm-machine-gmon.patch;apply=yes;striplevel=0 \
+	   file://trampoline.patch;apply=yes;striplevel=0 \
+	   file://dl-cache-libcmp.patch;apply=yes \
 	   \
            file://etc/ld.so.conf \
 	   file://generate-supported.mk"
 
 # seems to fail on tls platforms
-SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
+SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;apply=yes"
 
-SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1"
+SRC_URI_append_openmn = " file://ldsocache-varrun.patch;apply=yes"
 
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.3.3+cvs20050420.bb b/recipes/glibc/glibc_2.3.3+cvs20050420.bb
index 36b2c2cfd0..72942585fd 100644
--- a/recipes/glibc/glibc_2.3.3+cvs20050420.bb
+++ b/recipes/glibc/glibc_2.3.3+cvs20050420.bb
@@ -11,27 +11,27 @@ GLIBC_ADDONS ?= "linuxthreads"
 
 DEFAULT_PREFERENCE = "-1"
 
-#	   file://noinfo.patch;patch=1
-#	   file://ldconfig.patch;patch=1;pnum=0
+#	   file://noinfo.patch;apply=yes
+#	   file://ldconfig.patch;apply=yes;striplevel=0
 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \
-	   file://arm-ioperm.patch;patch=1;pnum=0 \
-	   file://fhs-linux-paths.patch;patch=1 \
-	   file://arm-no-hwcap.patch;patch=1;pnum=0 \
-	   file://arm-memcpy.patch;patch=1;pnum=0 \
-	   file://arm-longlong.patch;patch=1;pnum=0 \
-	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
-	   file://trampoline.patch;patch=1;pnum=0 \
-	   file://eabi-patch-1;patch=1 \
-	   file://eabi-patch-2;patch=1 \
-	   file://eabi-patch-3;patch=1 \
-	   file://5090_all_stubs-rule-fix.patch;patch=1 \
+	   file://arm-ioperm.patch;apply=yes;striplevel=0 \
+	   file://fhs-linux-paths.patch;apply=yes \
+	   file://arm-no-hwcap.patch;apply=yes;striplevel=0 \
+	   file://arm-memcpy.patch;apply=yes;striplevel=0 \
+	   file://arm-longlong.patch;apply=yes;striplevel=0 \
+	   file://arm-machine-gmon.patch;apply=yes;striplevel=0 \
+	   file://trampoline.patch;apply=yes;striplevel=0 \
+	   file://eabi-patch-1;apply=yes \
+	   file://eabi-patch-2;apply=yes \
+	   file://eabi-patch-3;apply=yes \
+	   file://5090_all_stubs-rule-fix.patch;apply=yes \
            file://etc/ld.so.conf \
 	   file://generate-supported.mk"
 
 # seems to fail on tls platforms
-SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
+SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;apply=yes"
 
-SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1"
+SRC_URI_append_openmn = " file://ldsocache-varrun.patch;apply=yes"
 
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.3.3.bb b/recipes/glibc/glibc_2.3.3.bb
index 3ca8b80ed9..bc77d75234 100644
--- a/recipes/glibc/glibc_2.3.3.bb
+++ b/recipes/glibc/glibc_2.3.3.bb
@@ -49,10 +49,10 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz;name=archive \
 	   file://etc/ld.so.conf \
  	   file://generate-supported.mk"
 
-SRC_URI_append_mtx-1 = " file://mips-abio32.patch;patch=1 \
-                         file://allow-gcc.patch;patch=1 "
-SRC_URI_append_mtx-2 = " file://mips-abio32.patch;patch=1 \
-                         file://allow-gcc.patch;patch=1 "
+SRC_URI_append_mtx-1 = " file://mips-abio32.patch;apply=yes \
+                         file://allow-gcc.patch;apply=yes "
+SRC_URI_append_mtx-2 = " file://mips-abio32.patch;apply=yes \
+                         file://allow-gcc.patch;apply=yes "
 
 S = "${WORKDIR}/glibc-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.3.5+cvs20050627.bb b/recipes/glibc/glibc_2.3.5+cvs20050627.bb
index 02970c47d5..8426796548 100644
--- a/recipes/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/recipes/glibc/glibc_2.3.5+cvs20050627.bb
@@ -30,39 +30,39 @@ python __anonymous () {
 RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
 RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev"
 
-#	   file://noinfo.patch;patch=1
-#	   file://ldconfig.patch;patch=1;pnum=0
-#	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
+#	   file://noinfo.patch;apply=yes
+#	   file://ldconfig.patch;apply=yes;striplevel=0
+#	   file://arm-machine-gmon.patch;apply=yes;striplevel=0 \
 #	   \
-#	   file://arm-ioperm.patch;patch=1;pnum=0 \
-#	   file://ldd.patch;patch=1;pnum=0 \
+#	   file://arm-ioperm.patch;apply=yes;striplevel=0 \
+#	   file://ldd.patch;apply=yes;striplevel=0 \
 SRC_URI = "http://familiar.handhelds.org/source/v0.8.3/stash_libc_sources.redhat.com__20050627.tar.gz;name=archive \
 	   http://familiar.handhelds.org/source/v0.8.3/stash_ports_sources.redhat.com__20050627.tar.gz;name=ports \
-	   file://arm-audit.patch;patch=1 \
-	   file://arm-audit2.patch;patch=1 \
-	   file://arm-no-hwcap.patch;patch=1 \
-	   file://arm-memcpy.patch;patch=1 \
-	   file://arm-longlong.patch;patch=1;pnum=0 \
-	   file://fhs-linux-paths.patch;patch=1 \
-	   file://dl-cache-libcmp.patch;patch=1 \
-	   file://ldsocache-varrun.patch;patch=1 \
-	   file://5090_all_stubs-rule-fix.patch;patch=1 \
-	   file://raise.patch;patch=1 \
-	   file://zecke-sane-readelf.patch;patch=1 \
-	   file://glibc-2.3.5-fix-weak-alias-arm.patch;patch=1 \
-	   file://glibc-2.3.5-fix-weak-alias-arm-2.patch;patch=1 \
+	   file://arm-audit.patch;apply=yes \
+	   file://arm-audit2.patch;apply=yes \
+	   file://arm-no-hwcap.patch;apply=yes \
+	   file://arm-memcpy.patch;apply=yes \
+	   file://arm-longlong.patch;apply=yes;striplevel=0 \
+	   file://fhs-linux-paths.patch;apply=yes \
+	   file://dl-cache-libcmp.patch;apply=yes \
+	   file://ldsocache-varrun.patch;apply=yes \
+	   file://5090_all_stubs-rule-fix.patch;apply=yes \
+	   file://raise.patch;apply=yes \
+	   file://zecke-sane-readelf.patch;apply=yes \
+	   file://glibc-2.3.5-fix-weak-alias-arm.patch;apply=yes \
+	   file://glibc-2.3.5-fix-weak-alias-arm-2.patch;apply=yes \
 	   file://etc/ld.so.conf \
 	   file://generate-supported.mk"
 
 # seems to fail on tls platforms
-SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
-SRC_URI_append_armeb = " file://dyn-ldconfig-20041128.patch;patch=1"
+SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;apply=yes"
+SRC_URI_append_armeb = " file://dyn-ldconfig-20041128.patch;apply=yes"
 
 # Build fails on sh3 and sh4 without additional patches
-SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1 \
-                       file://superh-fcntl.patch;patch=1;pnum=0"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1 \
-                       file://superh-fcntl.patch;patch=1;pnum=0"
+SRC_URI_append_sh3 = " file://no-z-defs.patch;apply=yes \
+                       file://superh-fcntl.patch;apply=yes;striplevel=0"
+SRC_URI_append_sh4 = " file://no-z-defs.patch;apply=yes \
+                       file://superh-fcntl.patch;apply=yes;striplevel=0"
 
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.3.6.bb b/recipes/glibc/glibc_2.3.6.bb
index a78db96bc8..8d20c60d3d 100644
--- a/recipes/glibc/glibc_2.3.6.bb
+++ b/recipes/glibc/glibc_2.3.6.bb
@@ -4,29 +4,29 @@ PR = "${INC_PR}.0"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
-#           ${CROSSTOOL_PATCH_URL}glibc-2.3.5-cygwin.patch;patch=1
+#           ${CROSSTOOL_PATCH_URL}glibc-2.3.5-cygwin.patch;apply=yes
 
 CROSSTOOL_PATCH_URL = "http://www.kegel.com/crosstool/crosstool-0.43/patches/glibc-2.3.6/"
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2;name=archive \
            ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-${PV}.tar.bz2;name=linuxthreads \
-           ${CROSSTOOL_PATCH_URL}glibc-2.3.5-sh-lowlevellock.patch;patch=1;name=crosspatch1 \
-           ${CROSSTOOL_PATCH_URL}glibc-2.3.5-sh-memset.patch;patch=1;name=crosspatch2 \
-           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-allow-gcc-4.0-arm.patch;patch=1;name=crosspatch3 \
-           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-allow-gcc-4.0-elf.patch;patch=1;name=crosspatch4 \
-           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-configure-apple-as.patch;patch=1;name=crosspatch5 \
-           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-fix-pr631.patch;patch=1;name=crosspatch6 \
-           ${CROSSTOOL_PATCH_URL}glibc-fp-byteorder.patch;patch=1;name=crosspatch7 \
-           ${CROSSTOOL_PATCH_URL}glibc-mips-bootstrap-gcc-header-install.patch;patch=1;name=crosspatch8 \
-           ${CROSSTOOL_PATCH_URL}arm-ctl_bus_isa.patch;patch=1;name=crosspatch9 \
-           ${CROSSTOOL_PATCH_URL}make-install-lib-all.patch;patch=1;name=crosspatch10 \
-           ${CROSSTOOL_PATCH_URL}maybe/glibc-2.3.6-allow-gcc-4.0-powerpc32.patch;patch=1;name=crosspatch11 \
-           file://glibc-2.3.6-bind-already-defined-on-powerpc.patch;patch=1 \
-           file://glibc-2.3.6-allow-gcc-4.1-powerpc32-initfini.s.patch;patch=1 \
-           file://glibc-2.3.6-linuxthreads-allow-gcc-4.1-powerpc32-initfini.s.patch;patch=1 \
-           file://late-install-loop-break.patch;patch=1 \
-           file://glibc-arm-socket-weakalias.patch;patch=1 \
-           file://glibc-2.3.6-linuxthreads-pthread-raise.patch;patch=1 \
-           file://glibc-cross_sunrpc.patch;patch=1 \
+           ${CROSSTOOL_PATCH_URL}glibc-2.3.5-sh-lowlevellock.patch;apply=yes;name=crosspatch1 \
+           ${CROSSTOOL_PATCH_URL}glibc-2.3.5-sh-memset.patch;apply=yes;name=crosspatch2 \
+           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-allow-gcc-4.0-arm.patch;apply=yes;name=crosspatch3 \
+           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-allow-gcc-4.0-elf.patch;apply=yes;name=crosspatch4 \
+           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-configure-apple-as.patch;apply=yes;name=crosspatch5 \
+           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-fix-pr631.patch;apply=yes;name=crosspatch6 \
+           ${CROSSTOOL_PATCH_URL}glibc-fp-byteorder.patch;apply=yes;name=crosspatch7 \
+           ${CROSSTOOL_PATCH_URL}glibc-mips-bootstrap-gcc-header-install.patch;apply=yes;name=crosspatch8 \
+           ${CROSSTOOL_PATCH_URL}arm-ctl_bus_isa.patch;apply=yes;name=crosspatch9 \
+           ${CROSSTOOL_PATCH_URL}make-install-lib-all.patch;apply=yes;name=crosspatch10 \
+           ${CROSSTOOL_PATCH_URL}maybe/glibc-2.3.6-allow-gcc-4.0-powerpc32.patch;apply=yes;name=crosspatch11 \
+           file://glibc-2.3.6-bind-already-defined-on-powerpc.patch;apply=yes \
+           file://glibc-2.3.6-allow-gcc-4.1-powerpc32-initfini.s.patch;apply=yes \
+           file://glibc-2.3.6-linuxthreads-allow-gcc-4.1-powerpc32-initfini.s.patch;apply=yes \
+           file://late-install-loop-break.patch;apply=yes \
+           file://glibc-arm-socket-weakalias.patch;apply=yes \
+           file://glibc-2.3.6-linuxthreads-pthread-raise.patch;apply=yes \
+           file://glibc-cross_sunrpc.patch;apply=yes \
            file://etc/ld.so.conf \
 	   file://generate-supported.mk"
 
diff --git a/recipes/glibc/glibc_2.4.bb b/recipes/glibc/glibc_2.4.bb
index 2f255a65fe..acf662cfb2 100644
--- a/recipes/glibc/glibc_2.4.bb
+++ b/recipes/glibc/glibc_2.4.bb
@@ -36,26 +36,26 @@ python __anonymous () {
 RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
 RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev"
 
-#	   file://noinfo.patch;patch=1
-#	   file://ldconfig.patch;patch=1;pnum=0
-#	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
+#	   file://noinfo.patch;apply=yes
+#	   file://ldconfig.patch;apply=yes;striplevel=0
+#	   file://arm-machine-gmon.patch;apply=yes;striplevel=0 \
 #	   \
-#	   file://arm-ioperm.patch;patch=1;pnum=0 \
-#	   file://ldd.patch;patch=1;pnum=0 \
+#	   file://arm-ioperm.patch;apply=yes;striplevel=0 \
+#	   file://ldd.patch;apply=yes;striplevel=0 \
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.4.tar.bz2;name=archive \
 	   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.4.tar.bz2;name=ports \
 	   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.4.tar.bz2;name=libidn \
-           file://arm-memcpy.patch;patch=1 \
-           file://arm-longlong.patch;patch=1 \
-           file://fhs-linux-paths.patch;patch=1 \
-           file://dl-cache-libcmp.patch;patch=1 \
-           file://ldsocache-varrun.patch;patch=1 \
-           file://nptl-crosscompile.patch;patch=1 \
-	   file://glibc-2.4-compile.patch;patch=1 \
-	   file://glibc-2.4-openat-3.patch;patch=1 \
-	   file://fixup-aeabi-syscalls.patch;patch=1 \
-	   file://zecke-sane-readelf.patch;patch=1 \
-	   file://arm_eabi_ipc_fix.patch;patch=1 \
+           file://arm-memcpy.patch;apply=yes \
+           file://arm-longlong.patch;apply=yes \
+           file://fhs-linux-paths.patch;apply=yes \
+           file://dl-cache-libcmp.patch;apply=yes \
+           file://ldsocache-varrun.patch;apply=yes \
+           file://nptl-crosscompile.patch;apply=yes \
+	   file://glibc-2.4-compile.patch;apply=yes \
+	   file://glibc-2.4-openat-3.patch;apply=yes \
+	   file://fixup-aeabi-syscalls.patch;apply=yes \
+	   file://zecke-sane-readelf.patch;apply=yes \
+	   file://arm_eabi_ipc_fix.patch;apply=yes \
 	   file://generic-bits_select.h \
 	   file://generic-bits_types.h \
 	   file://generic-bits_typesizes.h \
@@ -65,8 +65,8 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.4.tar.bz2;name=archive \
 
 
 # Build fails on sh3 and sh4 without additional patches
-SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
+SRC_URI_append_sh3 = " file://no-z-defs.patch;apply=yes"
+SRC_URI_append_sh4 = " file://no-z-defs.patch;apply=yes"
 
 S = "${WORKDIR}/glibc-2.4"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.5.bb b/recipes/glibc/glibc_2.5.bb
index 21a2ae748e..e3228e26cd 100644
--- a/recipes/glibc/glibc_2.5.bb
+++ b/recipes/glibc/glibc_2.5.bb
@@ -38,18 +38,18 @@ SRC_URI = "\
   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2;name=archive \
   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2;name=ports \
   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2;name=libidn \
-  file://arm-memcpy.patch;patch=1 \
-  file://arm-longlong.patch;patch=1 \
-  file://fhs-linux-paths.patch;patch=1 \
-  file://dl-cache-libcmp.patch;patch=1 \
-  file://ldsocache-varrun.patch;patch=1 \
-  file://nptl-crosscompile.patch;patch=1 \
-  file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1;pnum=0 \
-  file://glibc-check_pf.patch;patch=1;pnum=0 \
-  file://zecke-sane-readelf.patch;patch=1 \
-  file://ldd-unbash.patch;patch=1 \
-  file://glibc-2.6.1-use-short-for-fnstsw.patch;patch=1 \
-  file://glibc-arm-no-asm-page.patch;patch=1 \
+  file://arm-memcpy.patch;apply=yes \
+  file://arm-longlong.patch;apply=yes \
+  file://fhs-linux-paths.patch;apply=yes \
+  file://dl-cache-libcmp.patch;apply=yes \
+  file://ldsocache-varrun.patch;apply=yes \
+  file://nptl-crosscompile.patch;apply=yes \
+  file://glibc-2.5-local-dynamic-resolvconf.patch;apply=yes;striplevel=0 \
+  file://glibc-check_pf.patch;apply=yes;striplevel=0 \
+  file://zecke-sane-readelf.patch;apply=yes \
+  file://ldd-unbash.patch;apply=yes \
+  file://glibc-2.6.1-use-short-for-fnstsw.patch;apply=yes \
+  file://glibc-arm-no-asm-page.patch;apply=yes \
   file://generic-bits_select.h \
   file://generic-bits_types.h \
   file://generic-bits_typesizes.h \
@@ -59,16 +59,16 @@ SRC_URI = "\
 "
 
 # Build fails on sh3 and sh4 without additional patches
-SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
+SRC_URI_append_sh3 = " file://no-z-defs.patch;apply=yes"
+SRC_URI_append_sh4 = " file://no-z-defs.patch;apply=yes"
 
 # Powerpc patches to add support for soft-float
-SRC_URI_append_powerpc = " file://ppc-sfp-machine.patch;patch=1 \
-                           file://ppc-soft-fp-20070115.patch;patch=1 \
-                           file://ppc-ld-nofpu-20070104.patch;patch=1 \
-                           file://ppc-ports-ld-nofpu-20070114.patch;patch=1 \
-                           file://powerpc-sqrt-hack.diff;patch=1 \
-                           file://glibc-2.5-soft-fp-separate-strong-alias.patch;patch=1"
+SRC_URI_append_powerpc = " file://ppc-sfp-machine.patch;apply=yes \
+                           file://ppc-soft-fp-20070115.patch;apply=yes \
+                           file://ppc-ld-nofpu-20070104.patch;apply=yes \
+                           file://ppc-ports-ld-nofpu-20070114.patch;apply=yes \
+                           file://powerpc-sqrt-hack.diff;apply=yes \
+                           file://glibc-2.5-soft-fp-separate-strong-alias.patch;apply=yes"
 
 S = "${WORKDIR}/glibc-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.6.1.bb b/recipes/glibc/glibc_2.6.1.bb
index 86e6dca9b6..104ce88170 100644
--- a/recipes/glibc/glibc_2.6.1.bb
+++ b/recipes/glibc/glibc_2.6.1.bb
@@ -37,46 +37,46 @@ SRC_URI = "\
   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2;name=archive \
   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2;name=ports \
   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2;name=libidn \
-  file://arm-memcpy.patch;patch=1 \
-  file://arm-longlong.patch;patch=1 \
-  file://fhs-linux-paths.patch;patch=1 \
-  file://dl-cache-libcmp.patch;patch=1 \
-  file://nptl-crosscompile.patch;patch=1 \
-  file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1;pnum=0 \
-  file://glibc-check_pf.patch;patch=1;pnum=0 \
-  file://zecke-sane-readelf.patch;patch=1 \
-  file://ldd-unbash.patch;patch=1 \
+  file://arm-memcpy.patch;apply=yes \
+  file://arm-longlong.patch;apply=yes \
+  file://fhs-linux-paths.patch;apply=yes \
+  file://dl-cache-libcmp.patch;apply=yes \
+  file://nptl-crosscompile.patch;apply=yes \
+  file://glibc-2.5-local-dynamic-resolvconf.patch;apply=yes;striplevel=0 \
+  file://glibc-check_pf.patch;apply=yes;striplevel=0 \
+  file://zecke-sane-readelf.patch;apply=yes \
+  file://ldd-unbash.patch;apply=yes \
   file://generic-bits_select.h \
   file://generic-bits_types.h \
   file://generic-bits_typesizes.h \
   file://generic-bits_time.h \
   file://etc/ld.so.conf \
   file://generate-supported.mk \
-  file://glibc-2.6.1-RTLD_SINGLE_THREAD_P-1.patch;patch=1 \
-  file://glibc-2.6.1-use-short-for-fnstsw.patch;patch=1 \
-  file://glibc-use-isystem-include-fixed.patch;patch=1 \
-  file://glibc-arm-no-asm-page.patch;patch=1 \
-  file://armv4t-interworking.patch;patch=1 \
-  file://march-i686.patch;patch=1;pnum=0 \
+  file://glibc-2.6.1-RTLD_SINGLE_THREAD_P-1.patch;apply=yes \
+  file://glibc-2.6.1-use-short-for-fnstsw.patch;apply=yes \
+  file://glibc-use-isystem-include-fixed.patch;apply=yes \
+  file://glibc-arm-no-asm-page.patch;apply=yes \
+  file://armv4t-interworking.patch;apply=yes \
+  file://march-i686.patch;apply=yes;striplevel=0 \
 "
 
 SRC_URI_append_ep9312 = "\
-  file://glibc-crunch-endian-littleword-littlebyte.patch;patch=1 \
-  file://glibc-crunch-eabi-setjmp_longjmp.patch;patch=1 \
-  file://glibc-crunch-eabi-unwind.patch;patch=1 \
-  file://glibc-crunch-eabi.patch;patch=1 \
-  file://glibc-crunch-eabi-force.patch;patch=1 \
-  file://glibc-crunch-eabi-fraiseexcpt.patch;patch=1 \
+  file://glibc-crunch-endian-littleword-littlebyte.patch;apply=yes \
+  file://glibc-crunch-eabi-setjmp_longjmp.patch;apply=yes \
+  file://glibc-crunch-eabi-unwind.patch;apply=yes \
+  file://glibc-crunch-eabi.patch;apply=yes \
+  file://glibc-crunch-eabi-force.patch;apply=yes \
+  file://glibc-crunch-eabi-fraiseexcpt.patch;apply=yes \
 "
 
 # Build fails on sh3 and sh4 without additional patches
-SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
+SRC_URI_append_sh3 = " file://no-z-defs.patch;apply=yes"
+SRC_URI_append_sh4 = " file://no-z-defs.patch;apply=yes"
 
 # PowerPC Patches to add support for soft-float
 SRC_URI_append_powerpc = "\
-  file://powerpc-sqrt-hack.diff;patch=1 \
-  file://glibc-2.6.1-powerpc-nofpu.patch;patch=1 \
+  file://powerpc-sqrt-hack.diff;apply=yes \
+  file://glibc-2.6.1-powerpc-nofpu.patch;apply=yes \
 "
 
 S = "${WORKDIR}/glibc-${PV}"
diff --git a/recipes/glibc/glibc_2.7.bb b/recipes/glibc/glibc_2.7.bb
index 56275f8b12..4357a5b7ce 100644
--- a/recipes/glibc/glibc_2.7.bb
+++ b/recipes/glibc/glibc_2.7.bb
@@ -36,48 +36,48 @@ python __anonymous () {
 
 RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
 
-#	   file://noinfo.patch;patch=1
-#	   file://ldconfig.patch;patch=1;pnum=0
-#	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
+#	   file://noinfo.patch;apply=yes
+#	   file://ldconfig.patch;apply=yes;striplevel=0
+#	   file://arm-machine-gmon.patch;apply=yes;striplevel=0 \
 #	   \
-#	   file://arm-ioperm.patch;patch=1;pnum=0 \
-#	   file://ldd.patch;patch=1;pnum=0 \
+#	   file://arm-ioperm.patch;apply=yes;striplevel=0 \
+#	   file://ldd.patch;apply=yes;striplevel=0 \
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2;name=archive \
 	   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2;name=ports \
 	   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2;name=libidn \
-           file://arm-memcpy.patch;patch=1 \
-           file://arm-longlong.patch;patch=1 \
-           file://fhs-linux-paths.patch;patch=1 \
-           file://dl-cache-libcmp.patch;patch=1 \
-           file://ldsocache-varrun.patch;patch=1 \
-           file://nptl-crosscompile.patch;patch=1 \
-	   file://glibc-check_pf.patch;patch=1;pnum=0 \
-#	   file://glibc-2.4-compile.patch;patch=1 \
-#	   file://glibc-2.4-openat-3.patch;patch=1 \
-#	   file://fixup-aeabi-syscalls.patch;patch=1 \
-#	   file://zecke-sane-readelf.patch;patch=1 \
-           file://ldd-unbash.patch;patch=1 \
-	   file://glibc-arm-IO-acquire-lock-fix.diff;patch=1 \
-	   file://all_glibc-i586-chk.patch;patch=1 \
-	   file://glibc-2.6.1-use-short-for-fnstsw.patch;patch=1 \
-           file://glibc-use-isystem-include-fixed.patch;patch=1 \
+           file://arm-memcpy.patch;apply=yes \
+           file://arm-longlong.patch;apply=yes \
+           file://fhs-linux-paths.patch;apply=yes \
+           file://dl-cache-libcmp.patch;apply=yes \
+           file://ldsocache-varrun.patch;apply=yes \
+           file://nptl-crosscompile.patch;apply=yes \
+	   file://glibc-check_pf.patch;apply=yes;striplevel=0 \
+#	   file://glibc-2.4-compile.patch;apply=yes \
+#	   file://glibc-2.4-openat-3.patch;apply=yes \
+#	   file://fixup-aeabi-syscalls.patch;apply=yes \
+#	   file://zecke-sane-readelf.patch;apply=yes \
+           file://ldd-unbash.patch;apply=yes \
+	   file://glibc-arm-IO-acquire-lock-fix.diff;apply=yes \
+	   file://all_glibc-i586-chk.patch;apply=yes \
+	   file://glibc-2.6.1-use-short-for-fnstsw.patch;apply=yes \
+           file://glibc-use-isystem-include-fixed.patch;apply=yes \
 	   file://generic-bits_select.h \
 	   file://generic-bits_types.h \
 	   file://generic-bits_typesizes.h \
 	   file://generic-bits_time.h \
            file://etc/ld.so.conf \
            file://generate-supported.mk \
-           file://march-i686.patch;patch=1;pnum=0 \
-	   file://glibc-arm-no-asm-page.patch;patch=1 \
+           file://march-i686.patch;apply=yes;striplevel=0 \
+	   file://glibc-arm-no-asm-page.patch;apply=yes \
            "
 
 
 # Build fails on sh3 and sh4 without additional patches
-SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
+SRC_URI_append_sh3 = " file://no-z-defs.patch;apply=yes"
+SRC_URI_append_sh4 = " file://no-z-defs.patch;apply=yes"
 
 #powerpc patches to add support for soft-float
-SRC_URI_append_powerpc= " file://powerpc-sqrt-hack.diff;patch=1"
+SRC_URI_append_powerpc= " file://powerpc-sqrt-hack.diff;apply=yes"
 
 S = "${WORKDIR}/glibc-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_2.9.bb b/recipes/glibc/glibc_2.9.bb
index 43a4fcafaa..ab5ddcb14b 100644
--- a/recipes/glibc/glibc_2.9.bb
+++ b/recipes/glibc/glibc_2.9.bb
@@ -36,52 +36,52 @@ python __anonymous () {
 
 RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
 
-#	   file://noinfo.patch;patch=1
-#	   file://ldconfig.patch;patch=1;pnum=0
-#	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
+#	   file://noinfo.patch;apply=yes
+#	   file://ldconfig.patch;apply=yes;striplevel=0
+#	   file://arm-machine-gmon.patch;apply=yes;striplevel=0 \
 #	   \
-#	   file://arm-ioperm.patch;patch=1;pnum=0 \
-#	   file://ldd.patch;patch=1;pnum=0 \
+#	   file://arm-ioperm.patch;apply=yes;striplevel=0 \
+#	   file://ldd.patch;apply=yes;striplevel=0 \
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2;name=archive \
 	   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2;name=ports \
 	   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2;name=libidn \
-	   file://nscd-init.patch;patch=1;pnum=0 \
-           file://arm-memcpy.patch;patch=1 \
-           file://arm-longlong.patch;patch=1 \
-           file://fhs-linux-paths.patch;patch=1 \
-           file://dl-cache-libcmp.patch;patch=1 \
-           file://ldsocache-varrun.patch;patch=1 \
-           file://nptl-crosscompile.patch;patch=1 \
-	   file://glibc-check_pf.patch;patch=1;pnum=0 \
-           file://ldd-unbash.patch;patch=1 \
-	   file://glibc-arm-IO-acquire-lock-fix.diff;patch=1 \
+	   file://nscd-init.patch;apply=yes;striplevel=0 \
+           file://arm-memcpy.patch;apply=yes \
+           file://arm-longlong.patch;apply=yes \
+           file://fhs-linux-paths.patch;apply=yes \
+           file://dl-cache-libcmp.patch;apply=yes \
+           file://ldsocache-varrun.patch;apply=yes \
+           file://nptl-crosscompile.patch;apply=yes \
+	   file://glibc-check_pf.patch;apply=yes;striplevel=0 \
+           file://ldd-unbash.patch;apply=yes \
+	   file://glibc-arm-IO-acquire-lock-fix.diff;apply=yes \
 	   file://generic-bits_select.h \
 	   file://generic-bits_types.h \
 	   file://generic-bits_typesizes.h \
 	   file://generic-bits_time.h \
            file://etc/ld.so.conf \
            file://generate-supported.mk \
-           file://march-i686.patch;patch=1;pnum=0 \
-	   file://tls_i486.patch;patch=1 \
-	   file://glibc-2.9-use-_begin.patch;patch=1 \
-           file://arm-lowlevellock-include-tls.patch;patch=1 \
-           file://glibc-2.9-enable-binutils-2.2.patch;patch=1 \
+           file://march-i686.patch;apply=yes;striplevel=0 \
+	   file://tls_i486.patch;apply=yes \
+	   file://glibc-2.9-use-_begin.patch;apply=yes \
+           file://arm-lowlevellock-include-tls.patch;apply=yes \
+           file://glibc-2.9-enable-binutils-2.2.patch;apply=yes \
            "
 
 # patches to fix libmemusage.so
-SRC_URI_append = " file://0001-malloc-memusage.c-update_data-Fix-handling-of-wrappi.patch;patch=1 \
-                   file://0002-malloc-memusage.c-DEFAULT_BUFFER_SIZE-Change-to-3276.patch;patch=1 \
-                   file://0003-Fix-wrap-around-in-memusage.patch;patch=1 "
+SRC_URI_append = " file://0001-malloc-memusage.c-update_data-Fix-handling-of-wrappi.patch;apply=yes \
+                   file://0002-malloc-memusage.c-DEFAULT_BUFFER_SIZE-Change-to-3276.patch;apply=yes \
+                   file://0003-Fix-wrap-around-in-memusage.patch;apply=yes "
 
 
 # Build fails on sh3 and sh4 without additional patches
-SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1 \
-		file://glibc-2.9-sh-fix.patch;patch=1"
-SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1 \
-		file://glibc-2.9-sh-fix.patch;patch=1"
+SRC_URI_append_sh3 = " file://no-z-defs.patch;apply=yes \
+		file://glibc-2.9-sh-fix.patch;apply=yes"
+SRC_URI_append_sh4 = " file://no-z-defs.patch;apply=yes \
+		file://glibc-2.9-sh-fix.patch;apply=yes"
 
 #powerpc patches to add support for soft-float
-SRC_URI_append_powerpc= " file://powerpc-sqrt-hack.diff;patch=1"
+SRC_URI_append_powerpc= " file://powerpc-sqrt-hack.diff;apply=yes"
 
 S = "${WORKDIR}/glibc-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes/glibc/glibc_cvs.bb b/recipes/glibc/glibc_cvs.bb
index 22f48d29fc..efc1dca98e 100644
--- a/recipes/glibc/glibc_cvs.bb
+++ b/recipes/glibc/glibc_cvs.bb
@@ -27,29 +27,29 @@ python __anonymous () {
 RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
 RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev"
 
-#	   file://noinfo.patch;patch=1
-#	   file://ldconfig.patch;patch=1;pnum=0
-#	   file://arm-no-hwcap.patch;patch=1;pnum=0 \
-#	   file://arm-memcpy.patch;patch=1;pnum=0 \
-#	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
+#	   file://noinfo.patch;apply=yes
+#	   file://ldconfig.patch;apply=yes;striplevel=0
+#	   file://arm-no-hwcap.patch;apply=yes;striplevel=0 \
+#	   file://arm-memcpy.patch;apply=yes;striplevel=0 \
+#	   file://arm-machine-gmon.patch;apply=yes;striplevel=0 \
 #	   \
-#	   file://arm-ioperm.patch;patch=1;pnum=0 \
-#	   file://ldd.patch;patch=1;pnum=0 \
+#	   file://arm-ioperm.patch;apply=yes;striplevel=0 \
+#	   file://ldd.patch;apply=yes;striplevel=0 \
 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc \
 	   cvs://anoncvs@sources.redhat.com/cvs/glibc;module=ports \
-	   file://nscd-init.patch;patch=1;pnum=0 \
-	   file://arm-audit.patch;patch=1 \
-	   file://arm-audit2.patch;patch=1 \
-	   file://arm-memcpy.patch;patch=1 \
-	   file://arm-longlong.patch;patch=1;pnum=0 \
-	   file://fhs-linux-paths.patch;patch=1 \
-	   file://dl-cache-libcmp.patch;patch=1 \
-	   file://ldsocache-varrun.patch;patch=1 \
+	   file://nscd-init.patch;apply=yes;striplevel=0 \
+	   file://arm-audit.patch;apply=yes \
+	   file://arm-audit2.patch;apply=yes \
+	   file://arm-memcpy.patch;apply=yes \
+	   file://arm-longlong.patch;apply=yes;striplevel=0 \
+	   file://fhs-linux-paths.patch;apply=yes \
+	   file://dl-cache-libcmp.patch;apply=yes \
+	   file://ldsocache-varrun.patch;apply=yes \
            file://etc/ld.so.conf \
 	   file://generate-supported.mk"
 
 # seems to fail on tls platforms
-SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
+SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;apply=yes"
 
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"