xcb-proto: Drop custom staging function

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/xcb/xcb-proto.inc b/meta/packages/xcb/xcb-proto.inc
index 2d2f8b776f23ffb61df71de95e8761e0a2872b1e..b294d1ac559de8c938fb19bf57b5b34b51cb46e6 100644 (file)
--- a/meta/packages/xcb/xcb-proto.inc
+++ b/meta/packages/xcb/xcb-proto.inc
@@ -5,17 +5,9 @@ HOMEPAGE = "http://xcb.freedesktop.org"
 
 SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2"
 
-inherit autotools pkgconfig
+inherit autotools_stage pkgconfig
 
 FILES_${PN}-dev += "${datadir}/xcb/*.xml"
 
-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
-}
-
 RDEPENDS_${PN}-dev = ""
 RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})"

diff --git a/meta/packages/xcb/xcb-proto_1.2.bb b/meta/packages/xcb/xcb-proto_1.2.bb
deleted file mode 100644 (file)
index e602252..0000000
--- a/meta/packages/xcb/xcb-proto_1.2.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include xcb-proto.inc
-PR = "r1"

diff --git a/meta/packages/xcb/xcb-proto_git.bb b/meta/packages/xcb/xcb-proto_git.bb
index 8b5981b7399b16eb420bc5cb01ed7d53674e1848..6eaa0dd2781474cf4897d6e08649d3825fb60993 100644 (file)
--- a/meta/packages/xcb/xcb-proto_git.bb
+++ b/meta/packages/xcb/xcb-proto_git.bb
@@ -6,9 +6,5 @@ PV = "1.2+gitr${SRCREV}"
 SRC_URI = "git://anongit.freedesktop.org/git/xcb/proto;protocol=git"
 S = "${WORKDIR}/git"
 
-do_stage() {
-       autotools_stage_all
-}
-
 DEPENDS_append_virtclass-native = " python-native"
 BBCLASSEXTEND = "native"