staging/insane.bbclass: Move legacy do_stage check iinto insane.bbclass

We might as well put all the sanity checks in one place.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 1905c0dfddc6012adb1fb38eaa1b38e0359d61df..58fc70c56f50eaf5f1629b87662fe3dfb71ad5e6 100644 (file)
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -903,6 +903,9 @@ python () {
     # Check various variables
     ###########################################################################
 
+    if d.getVar('do_stage', True) is not None:
+        bb.fatal("Legacy staging found for %s as it has a do_stage function. This will need conversion to a do_install or often simply removal to work with OE-core" % d.getVar("FILE", True))
+
     issues = []
     if (d.getVar('PACKAGES', True) or "").split():
         for var in 'RDEPENDS', 'RRECOMMENDS', 'FILES', 'pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm':

diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index da90d31678ace9fce2e3bef9a6cad8b4322f67a6..643352dc1ea54223aff86d7ff4c076ed4119dcac 100644 (file)
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -114,9 +114,4 @@ python do_populate_sysroot_setscene () {
 }
 addtask do_populate_sysroot_setscene
 
-python () {
-    if d.getVar('do_stage', True) is not None:
-        bb.fatal("Legacy staging found for %s as it has a do_stage function. This will need conversion to a do_install or often simply removal to work with OE-core" % d.getVar("FILE", True))
-}
-