From patchwork Sun Feb 3 23:55:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [06/22] staging/insane.bbclass: Move legacy do_stage check iinto insane.bbclass Date: Sun, 03 Feb 2013 23:55:36 -0000 From: Richard Purdie X-Patchwork-Id: 43891 Message-Id: <1c30e095444653f1f33d3feee35b691016230c8d.1359935562.git.richard.purdie@linuxfoundation.org> To: openembedded-core@lists.openembedded.org We might as well put all the sanity checks in one place. Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 3 +++ meta/classes/staging.bbclass | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 7e5634d..504182c 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): 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 da90d31..643352d 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)) -} -