native.bbclass: If do_stage isn't overridden, allow do_install to run for native packages

Also let do_install run for packages that run autotools_stage_all directly

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

1 files changed, 5 insertions, 5 deletions

diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 7064c951a3..6bd37697d0 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -75,19 +75,19 @@ do_stage_native () {
         fi
 }
 
-
 do_stage () {
         do_stage_native
 }
 
-do_install () {
-        true
-}
-
 PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}"
 PKG_CONFIG_SYSROOT_DIR = ""
 
 python __anonymous () {
+    # If we've a legacy native do_stage, we need to neuter do_install
+    stagefunc = bb.data.getVar('do_stage', d, True)
+    if (stagefunc.strip() != "do_stage_native" and stagefunc.strip() != "autotools_stage_all") and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1":
+        bb.data.setVar("do_install", "      :", d)
+
     pn = bb.data.getVar("PN", d, True)
     depends = bb.data.getVar("DEPENDS", d, True)
     deps = bb.utils.explode_deps(depends)