From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sun, 3 Feb 2013 16:59:09 +0000 (+0000)
Subject: staging/insane.bbclass: Move legacy do_stage check iinto insane.bbclass
X-Git-Tag: 2015-4~7664
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=05be11c7508984cc4aa757becb7a8f47c5b7e919;p=openembedded-core.git

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 1905c0dfdd..58fc70c56f 100644
--- 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 da90d31678..643352dc1e 100644
--- 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))
-}
-