[oe-commits] Richard Purdie : base.bbclass: Drop legacy rebuild mangling code

[git version control]

Module: openembedded.git
Branch: rpurdie/work-in-progress
Commit: fc32427d98f881be09b0ebd08f06cd3cb525f5a0
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=fc32427d98f881be09b0ebd08f06cd3cb525f5a0

Author: Richard Purdie <rpurdie at linux.intel.com>
Date:   Sun Nov  8 20:48:44 2009 +0000

base.bbclass: Drop legacy rebuild mangling code

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

---

 classes/base.bbclass |   23 +----------------------
 1 files changed, 1 insertions(+), 22 deletions(-)

diff --git a/classes/base.bbclass b/classes/base.bbclass
index cb8f900..84a8cc9 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
@@ -1280,21 +1270,10 @@ def base_after_parse(d):
 
 python () {
     import bb
-    from bb import __version__
     base_after_parse(d)
 
     if is_legacy_staging(d):
         bb.debug(1, "Legacy staging mode for %s" % bb.data.getVar("FILE", d, True))
-
-    # 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):