[oe-commits] Koen Kooi : expat: convert to new style staging

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 3eea5b412e0aecf66989aa2a58c8370b12c5be46
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3eea5b412e0aecf66989aa2a58c8370b12c5be46

Author: Koen Kooi <koen at openembedded.org>
Date:   Sat Mar 27 11:14:51 2010 +0100

expat: convert to new style staging

---

 recipes/expat/expat_1.95.6.bb |    7 +------
 recipes/expat/expat_1.95.7.bb |    7 +------
 recipes/expat/expat_2.0.1.bb  |    8 +-------
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/recipes/expat/expat_1.95.6.bb b/recipes/expat/expat_1.95.6.bb
index 576ad76..2fae460 100644
--- a/recipes/expat/expat_1.95.6.bb
+++ b/recipes/expat/expat_1.95.6.bb
@@ -1,11 +1,6 @@
 require expat.inc
 
-PR = "r1"
-
-do_stage () {
-	install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/
-	oe_libinstall -so libexpat ${STAGING_LIBDIR}/
-}
+PR = "r2"
 
 do_install () {
 	oe_runmake prefix="${D}${prefix}" \
diff --git a/recipes/expat/expat_1.95.7.bb b/recipes/expat/expat_1.95.7.bb
index 7b48305..dad1b49 100644
--- a/recipes/expat/expat_1.95.7.bb
+++ b/recipes/expat/expat_1.95.7.bb
@@ -1,5 +1,5 @@
 require expat.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://autotools.patch;patch=1 \
 	    file://expat-XMLCALL.patch;patch=1 \
@@ -12,11 +12,6 @@ do_configure () {
 	autotools_do_configure
 }
 
-do_stage () {
-	install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/
-	oe_libinstall -so libexpat ${STAGING_LIBDIR}
-}
-
 do_install () {
 	oe_runmake prefix="${D}${prefix}" \
 		bindir="${D}${bindir}" \
diff --git a/recipes/expat/expat_2.0.1.bb b/recipes/expat/expat_2.0.1.bb
index 41739e8..1d06b9e 100644
--- a/recipes/expat/expat_2.0.1.bb
+++ b/recipes/expat/expat_2.0.1.bb
@@ -1,5 +1,5 @@
 require expat.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://autotools.patch;patch=1"
 SRC_URI[src.md5sum] = "ee8b492592568805593f81f8cdf2a04c"
@@ -13,12 +13,6 @@ do_configure() {
 	autotools_do_configure
 }
 
-do_stage() {
-	install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/
-	install -m 0644 ${S}/lib/expat_external.h ${STAGING_INCDIR}/
-	oe_libinstall -so libexpat ${STAGING_LIBDIR}
-}
-
 do_install() {
 	oe_runmake prefix="${D}${prefix}" \
 		bindir="${D}${bindir}" \