From 0d722f5b12f447a46af3f935c0c516bfab927893 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 8 Nov 2009 20:48:44 +0000 Subject: base.bbclass: Drop legacy rebuild mangling code Signed-off-by: Richard Purdie --- classes/base.bbclass | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index 89ee917d20..4cda29cf38 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -529,21 +529,11 @@ python do_cleanall() { do_cleanall[recrdeptask] = "do_clean" addtask cleanall after do_clean -#Uncomment this for bitbake 1.8.12 -#addtask rebuild after do_${BB_DEFAULT_TASK} -addtask rebuild +addtask rebuild after do_${BB_DEFAULT_TASK} do_rebuild[dirs] = "${TOPDIR}" do_rebuild[nostamp] = "1" python base_do_rebuild() { """rebuild a package""" - from bb import __version__ - try: - from distutils.version import LooseVersion - except ImportError: - def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1 - if (LooseVersion(__version__) < LooseVersion('1.8.11')): - bb.build.exec_func('do_clean', d) - bb.build.exec_task('do_' + bb.data.getVar('BB_DEFAULT_TASK', d, 1), d) } addtask mrproper @@ -1235,18 +1225,7 @@ def base_after_parse(d): python () { import bb - from bb import __version__ base_after_parse(d) - - # Remove this for bitbake 1.8.12 - try: - from distutils.version import LooseVersion - except ImportError: - def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1 - if (LooseVersion(__version__) >= LooseVersion('1.8.11')): - deps = bb.data.getVarFlag('do_rebuild', 'deps', d) or [] - deps.append('do_' + bb.data.getVar('BB_DEFAULT_TASK', d, 1)) - bb.data.setVarFlag('do_rebuild', 'deps', deps, d) } def check_app_exists(app, d): -- cgit v1.2.3