cross.bbclass: Adjust the core class staging method as all users have been vetted and won't be affected

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

4 files changed, 4 insertions, 28 deletions

diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 5cabfa8787..e38d53ced9 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -40,12 +40,12 @@ exec_prefix = "${prefix}"
 base_sbindir = "${base_prefix}/bin"
 sbindir = "${exec_prefix}/bin"
 
-do_stage () {
-        oe_runmake install
+do_install () {
+        oe_runmake 'DESTDIR=${D}' install
 }
 
-do_install () {
-        :
+do_stage () {
+        autotools_stage_all
 }
 
 #
diff --git a/meta/packages/gdb/gdb-cross-canadian_6.8.bb b/meta/packages/gdb/gdb-cross-canadian_6.8.bb
index d20c64ca27..badcba2533 100644
--- a/meta/packages/gdb/gdb-cross-canadian_6.8.bb
+++ b/meta/packages/gdb/gdb-cross-canadian_6.8.bb
@@ -3,11 +3,3 @@ require gdb-cross.inc
 DEPENDS = "ncurses-nativesdk expat-nativesdk"
 
 inherit cross-canadian
-
-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 b8bcfd6080..1618c80bec 100644
--- a/meta/packages/gdb/gdb-cross.inc
+++ b/meta/packages/gdb/gdb-cross.inc
@@ -14,11 +14,3 @@ do_configure () {
 }
 
 inherit cross
-
-do_install () {
-        autotools_do_install
-}
-
-do_stage () {
-        autotools_stage_all
-}
diff --git a/meta/packages/gdb/gdb-cross_6.8.bb b/meta/packages/gdb/gdb-cross_6.8.bb
index 00e9c2f6c6..8462b6cb86 100644
--- a/meta/packages/gdb/gdb-cross_6.8.bb
+++ b/meta/packages/gdb/gdb-cross_6.8.bb
@@ -2,14 +2,6 @@ require gdb-cross.inc
 
 inherit cross
 
-do_install () {
-        autotools_do_install
-}
-
-do_stage () {
-        autotools_stage_all
-}
-
 SRC_URI += "file://sim-install-6.6.patch;patch=1"
 
 PR = "r2"