base.bbclass: Only run do_stage if its been overwritten as the default is empty and...

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

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 0605c8a0e38e86a7efc0e3d39064e5a8f046fbf5..7dbac018eadab99581cab025040ae4515e5cc754 100644 (file)
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -937,7 +937,12 @@ do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/${bindir} ${STAGING_DIR_TARGE
 addtask populate_staging after do_install
 
 python do_populate_staging () {
-    bb.build.exec_func('do_stage', d)
+    #
+    # Only run do_stage if its not the empty default above
+    #
+    stagefunc = bb.data.getVar('do_stage', d, 1).strip()
+    if stagefunc != "base_do_stage":
+        bb.build.exec_func('do_stage', d)
 }
 
 addtask install after do_compile