[oe-commits] Khem Raj : xcb-proto: Get rid of legacy staging.

[git version control]

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

Author: Khem Raj <raj.khem at gmail.com>
Date:   Tue Aug  3 15:05:19 2010 -0700

xcb-proto: Get rid of legacy staging.

* Convert to using INC_PR

Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 recipes/xcb/xcb-proto.inc       |    9 ++-------
 recipes/xcb/xcb-proto_0.9.91.bb |    3 ++-
 recipes/xcb/xcb-proto_0.9.92.bb |    2 +-
 recipes/xcb/xcb-proto_0.9.93.bb |    2 +-
 recipes/xcb/xcb-proto_0.9.bb    |    2 +-
 recipes/xcb/xcb-proto_1.0.bb    |    2 +-
 recipes/xcb/xcb-proto_1.6.bb    |    2 +-
 recipes/xcb/xcb-proto_git.bb    |    2 +-
 8 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/recipes/xcb/xcb-proto.inc b/recipes/xcb/xcb-proto.inc
index 13e6bc9..0d89dfc 100644
--- a/recipes/xcb/xcb-proto.inc
+++ b/recipes/xcb/xcb-proto.inc
@@ -7,13 +7,8 @@ SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2"
 
 inherit autotools pkgconfig
 
+INC_PR = "r2"
+
 FILES_${PN}-dev += "${datadir}/xcb/*.xml"
 ALLOW_EMPTY_${PN} = "1"
 
-do_stage() {
-	oe_runmake DESTDIR="${D}" install
-	mkdir -p ${STAGING_LIBDIR}/pkgconfig
-	install ${D}${libdir}/pkgconfig/xcb-proto.pc ${STAGING_LIBDIR}/pkgconfig
-	mkdir -p ${STAGING_DATADIR}/xcb
-	install ${D}${datadir}/xcb/*.xml ${STAGING_DATADIR}/xcb
-}
diff --git a/recipes/xcb/xcb-proto_0.9.91.bb b/recipes/xcb/xcb-proto_0.9.91.bb
index 3b71848..e2ddb11 100644
--- a/recipes/xcb/xcb-proto_0.9.91.bb
+++ b/recipes/xcb/xcb-proto_0.9.91.bb
@@ -1,5 +1,6 @@
 include xcb-proto.inc
-PR = "r0"
+
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "830cac0c81e43807849dd172bf7e65e2"
 SRC_URI[sha256sum] = "cefb1a052f8366d1ddfaabc9dc4207307855ab2b12862989fa3cbec02a48f1fa"
diff --git a/recipes/xcb/xcb-proto_0.9.92.bb b/recipes/xcb/xcb-proto_0.9.92.bb
index f8dbb80..c945963 100644
--- a/recipes/xcb/xcb-proto_0.9.92.bb
+++ b/recipes/xcb/xcb-proto_0.9.92.bb
@@ -1,5 +1,5 @@
 include xcb-proto.inc
-PR = "r0"
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "dc05c33ae1efc3e59d725887de9fc1a6"
 SRC_URI[sha256sum] = "4590e383f9bb6cc724e2033911a96d36f5966a5f82771bd3f06a63add2aa3e10"
diff --git a/recipes/xcb/xcb-proto_0.9.93.bb b/recipes/xcb/xcb-proto_0.9.93.bb
index b22e578..9601345 100644
--- a/recipes/xcb/xcb-proto_0.9.93.bb
+++ b/recipes/xcb/xcb-proto_0.9.93.bb
@@ -1,5 +1,5 @@
 include xcb-proto.inc
-PR = "r0"
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "43298a907d6d242132c20e4338c2f33f"
 SRC_URI[sha256sum] = "3f28eb14edd588878d39a33803adc0d3cc49e9dfaef77d9db0490125b3da786e"
diff --git a/recipes/xcb/xcb-proto_0.9.bb b/recipes/xcb/xcb-proto_0.9.bb
index b483c42..ec8222b 100644
--- a/recipes/xcb/xcb-proto_0.9.bb
+++ b/recipes/xcb/xcb-proto_0.9.bb
@@ -1,2 +1,2 @@
 include xcb-proto.bb
-PR = "r0"
+PR = "${INC_PR}.0"
diff --git a/recipes/xcb/xcb-proto_1.0.bb b/recipes/xcb/xcb-proto_1.0.bb
index 8fc5a72..0a08f8e 100644
--- a/recipes/xcb/xcb-proto_1.0.bb
+++ b/recipes/xcb/xcb-proto_1.0.bb
@@ -1,5 +1,5 @@
 include xcb-proto.inc
-PR = "r0"
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "d31407eaae7e52d100645217767a41aa"
 SRC_URI[sha256sum] = "df3ce807139957a9d3bd196a6eb5fad1d04af079d47b0ec36502911520b84e08"
diff --git a/recipes/xcb/xcb-proto_1.6.bb b/recipes/xcb/xcb-proto_1.6.bb
index c92396e..db18c2a 100644
--- a/recipes/xcb/xcb-proto_1.6.bb
+++ b/recipes/xcb/xcb-proto_1.6.bb
@@ -1,5 +1,5 @@
 include xcb-proto.inc
-PR = "r1"
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "04313e1d914b44d0e457f6c494fc178b"
 SRC_URI[sha256sum] = "f52bc1159b12496f002404eb5793c01277b20c82cb72c5ff076d7b25da9b5ca2"
diff --git a/recipes/xcb/xcb-proto_git.bb b/recipes/xcb/xcb-proto_git.bb
index f8fb4ae..8e132f2 100644
--- a/recipes/xcb/xcb-proto_git.bb
+++ b/recipes/xcb/xcb-proto_git.bb
@@ -3,7 +3,7 @@ DEFAULT_PREFERENCE = "-1"
 include xcb-proto.inc
 SRCREV = "2d873a3dc8c0e1315be426da8054adb4188574b0"
 PV = "1.6+git"
-PR = "r0"
+PR = "${INC_PR}.0"
 
 SRC_URI = "git://anongit.freedesktop.org/xcb/proto;protocol=git"
 S = "${WORKDIR}/git"