9 files changed, 14 insertions, 30 deletions
diff --git a/recipes/apr/apr-util_0.9.12.bb b/recipes/apr/apr-util_0.9.12.bb
index f1f19ed6af..89c9a93022 100644
--- a/recipes/apr/apr-util_0.9.12.bb
+++ b/recipes/apr/apr-util_0.9.12.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://apr.apache.org"
 PR = "r1"
 
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
-           file://gen_uri_delims.patch;patch=1 \
+           file://gen_uri_delims.patch \
            file://uri_delims.h"
 
 EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm --with-gdbm=${STAGING_DIR_HOST}${layout_prefix} --with-expat=${STAGING_DIR_HOST}${layout_prefix}"
@@ -18,9 +18,5 @@ do_configure() {
 	oe_runconf
 }
 
-do_stage() {
-	autotools_stage_all
-}
-
 SRC_URI[md5sum] = "8e9cc71a1303b67b3278fbeab9799f2e"
 SRC_URI[sha256sum] = "5768fcc4d38fa6f811b0a89e2ef450d0f52688ff9263e548819adb096fbfc9c3"
diff --git a/recipes/apr/apr-util_1.2.12.bb b/recipes/apr/apr-util_1.2.12.bb
index fc9fb364e5..698a3f0ca7 100644
--- a/recipes/apr/apr-util_1.2.12.bb
+++ b/recipes/apr/apr-util_1.2.12.bb
@@ -9,7 +9,7 @@ inherit autotools lib_package binconfig
 
 # apache mirrors?
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
-           file://configure_fixes.patch;patch=1"
+           file://configure_fixes.patch"
 
 EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm \
 		--with-gdbm=${STAGING_DIR_HOST}${layout_prefix} \
@@ -30,9 +30,5 @@ do_configure_prepend() {
 	libtoolize --force
 }
 
-do_stage() {
-	autotools_stage_all
-}
-
 SRC_URI[md5sum] = "e292942e22edd21b68609086352212e4"
 SRC_URI[sha256sum] = "7d70ff17bec733bdb04a6653a8e9c15ab7d88429dac91a4ae58c1db5caaee07f"
diff --git a/recipes/apr/apr-util_1.2.7.bb b/recipes/apr/apr-util_1.2.7.bb
index 971221ea80..282b55e388 100644
--- a/recipes/apr/apr-util_1.2.7.bb
+++ b/recipes/apr/apr-util_1.2.7.bb
@@ -7,7 +7,7 @@ PR = "r3"
 
 # apache mirrors?
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
-           file://configure_fixes.patch;patch=1"
+           file://configure_fixes.patch"
 
 EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm \
 		--with-gdbm=${STAGING_DIR_HOST}${layout_prefix} \
@@ -24,9 +24,5 @@ do_configure_prepend () {
 	cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
 }
 
-do_stage() {
-	autotools_stage_all
-}
-
 SRC_URI[md5sum] = "c3702668a640be1695956115857ec22e"
 SRC_URI[sha256sum] = "8cd84eb2031a91572e1be2975f4171730a9be72c4cd88718c4c40ac7dc4fd7d3"
diff --git a/recipes/apr/apr-util_1.3.4.bb b/recipes/apr/apr-util_1.3.4.bb
index 6b56fe92e3..c0ac30c5e1 100644
--- a/recipes/apr/apr-util_1.3.4.bb
+++ b/recipes/apr/apr-util_1.3.4.bb
@@ -6,8 +6,8 @@ LICENSE = "Apache License, Version 2.0"
 PR = "r5"
 
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
-           file://configfix.patch;patch=1 \
-           file://configure_fixes.patch;patch=1"
+           file://configfix.patch \
+           file://configure_fixes.patch"
 
 EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ 
 		--with-dbm=gdbm \
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
 		--with-expat=${STAGING_DIR_HOST}${layout_prefix}"
 
 
-inherit autotools_stage lib_package binconfig
+inherit autotools lib_package binconfig
 
 OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
 
diff --git a/recipes/apr/apr_0.9.12.bb b/recipes/apr/apr_0.9.12.bb
index 94d6493bcb..8748757663 100644
--- a/recipes/apr/apr_0.9.12.bb
+++ b/recipes/apr/apr_0.9.12.bb
@@ -12,9 +12,5 @@ do_configure() {
 	oe_runconf
 }
 
-do_stage() {
-	autotools_stage_all
-}
-
 SRC_URI[md5sum] = "63fef787c263bd8025c6ab6a6cecdd01"
 SRC_URI[sha256sum] = "cd1da2119dd812127ab6e6e8cbb954d9b74fe01ec744364ba79c9845865ffdaa"
diff --git a/recipes/apr/apr_1.2.12.bb b/recipes/apr/apr_1.2.12.bb
index ec0f824896..dd4493f571 100644
--- a/recipes/apr/apr_1.2.12.bb
+++ b/recipes/apr/apr_1.2.12.bb
@@ -6,7 +6,7 @@ PR = "r1"
 
 # apache mirrors?
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
-           file://configure_fixes.patch;patch=1"
+           file://configure_fixes.patch"
 
 inherit autotools lib_package binconfig
 
diff --git a/recipes/apr/apr_1.2.7.bb b/recipes/apr/apr_1.2.7.bb
index fce7e02b46..cfb6e30582 100644
--- a/recipes/apr/apr_1.2.7.bb
+++ b/recipes/apr/apr_1.2.7.bb
@@ -6,7 +6,7 @@ PR = "r2"
 
 # apache mirrors?
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
-           file://configure_fixes.patch;patch=1"
+           file://configure_fixes.patch"
 
 inherit autotools lib_package binconfig
 
diff --git a/recipes/apr/apr_1.3.3.bb b/recipes/apr/apr_1.3.3.bb
index 5862e40dc8..3a49235842 100644
--- a/recipes/apr/apr_1.3.3.bb
+++ b/recipes/apr/apr_1.3.3.bb
@@ -5,9 +5,9 @@ LICENSE = "Apache License, Version 2.0"
 PR = "r4"
 
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
-           file://configure_fixes.patch;patch=1 \
-	   file://cleanup.patch;patch=1 \
-           file://configfix.patch;patch=1"
+           file://configure_fixes.patch \
+	   file://cleanup.patch \
+           file://configfix.patch"
 
 inherit autotools lib_package binconfig
 
diff --git a/recipes/apr/apr_1.3.5.bb b/recipes/apr/apr_1.3.5.bb
index 11b9147fe4..a8362e4165 100644
--- a/recipes/apr/apr_1.3.5.bb
+++ b/recipes/apr/apr_1.3.5.bb
@@ -5,9 +5,9 @@ LICENSE = "Apache License, Version 2.0"
 PR = "r4"
 
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2;name=apr135tarbz2 \
-           file://configure_fixes.patch;patch=1 \
-#	   file://cleanup.patch;patch=1 \
-           file://configfix.patch;patch=1"
+           file://configure_fixes.patch \
+#	   file://cleanup.patch \
+           file://configfix.patch"
 
 inherit autotools lib_package binconfig