From d560f9fa61247e396900450831168a930c0cd2b0 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 17 Nov 2009 10:26:33 +0000 Subject: gdb: Clean up do_install and convert to use install for staging Signed-off-by: Richard Purdie --- meta/packages/gdb/gdb-cross-canadian_6.8.bb | 8 ++++++-- meta/packages/gdb/gdb-cross.inc | 8 +++++++- meta/packages/gdb/gdb-cross_6.8.bb | 12 ++++++++++-- meta/packages/gdb/gdb.inc | 8 -------- 4 files changed, 23 insertions(+), 13 deletions(-) (limited to 'meta/packages') diff --git a/meta/packages/gdb/gdb-cross-canadian_6.8.bb b/meta/packages/gdb/gdb-cross-canadian_6.8.bb index bf5afab62..d20c64ca2 100644 --- a/meta/packages/gdb/gdb-cross-canadian_6.8.bb +++ b/meta/packages/gdb/gdb-cross-canadian_6.8.bb @@ -4,6 +4,10 @@ DEPENDS = "ncurses-nativesdk expat-nativesdk" inherit cross-canadian -do_stage() { - : +do_install () { + autotools_do_install +} + +do_stage () { + autotools_stage_all } diff --git a/meta/packages/gdb/gdb-cross.inc b/meta/packages/gdb/gdb-cross.inc index 480cce493..b8bcfd608 100644 --- a/meta/packages/gdb/gdb-cross.inc +++ b/meta/packages/gdb/gdb-cross.inc @@ -13,6 +13,12 @@ do_configure () { oe_runconf } +inherit cross + +do_install () { + autotools_do_install +} + do_stage () { - oe_runmake install + autotools_stage_all } diff --git a/meta/packages/gdb/gdb-cross_6.8.bb b/meta/packages/gdb/gdb-cross_6.8.bb index 9a769c0a7..00e9c2f6c 100644 --- a/meta/packages/gdb/gdb-cross_6.8.bb +++ b/meta/packages/gdb/gdb-cross_6.8.bb @@ -1,7 +1,15 @@ require gdb-cross.inc -SRC_URI += "file://sim-install-6.6.patch;patch=1" - inherit cross +do_install () { + autotools_do_install +} + +do_stage () { + autotools_stage_all +} + +SRC_URI += "file://sim-install-6.6.patch;patch=1" + PR = "r2" diff --git a/meta/packages/gdb/gdb.inc b/meta/packages/gdb/gdb.inc index c32c6cf14..8c9bfa726 100644 --- a/meta/packages/gdb/gdb.inc +++ b/meta/packages/gdb/gdb.inc @@ -31,11 +31,3 @@ do_configure () { CPPFLAGS="" oe_runconf } -do_install () { - make -C bfd/doc chew LDFLAGS= CFLAGS=-O2 - oe_runmake DESTDIR='${D}' install - install -d ${D}${bindir} - install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir} -} - - -- cgit v1.2.3