[oe-commits] org.oe.dev classes/conf: Remove bitbake < 1.8.8 compatibility code

[rpurdie commit]

classes/conf: Remove bitbake < 1.8.8 compatibility code

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: b77696cb109de5ce247a119d5540d7f19a844ea9
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b77696cb109de5ce247a119d5540d7f19a844ea9
Files:
1
classes/base.bbclass
classes/rm_work.bbclass
conf/bitbake.conf
Diffs:

#
# mt diff -rc43c60af6aa40fd58b7991ed3767b7301114e2a8 -rb77696cb109de5ce247a119d5540d7f19a844ea9
#
# 
# 
# patch "classes/base.bbclass"
#  from [779298f52bb10c70b8a2f80e10f171c81d33aa78]
#    to [d0d8cdb0b25aaa62b66b99e71e401912b449c593]
# 
# patch "classes/rm_work.bbclass"
#  from [ee47e8ab4e8989bafbb4ab34525d27fa9ea12103]
#    to [e7bd77dd0dc1cf9bd9e2b63fb4bbb5351e7b1ebe]
# 
# patch "conf/bitbake.conf"
#  from [d345b97ed205e335f85c0528040d80119f07236d]
#    to [27f28821d89de0f8fab490644ac698eedc27f811]
# 
============================================================
--- classes/base.bbclass	779298f52bb10c70b8a2f80e10f171c81d33aa78
+++ classes/base.bbclass	d0d8cdb0b25aaa62b66b99e71e401912b449c593
@@ -582,10 +582,6 @@ python base_do_unpack() {
 			local = bb.data.expand(bb.fetch.localpath(url, localdata), localdata)
 		except bb.MalformedUrl, e:
 			raise FuncFailed('Unable to generate local path for malformed uri: %s' % e)
-		# dont need any parameters for extraction, strip them off
-		# RP: Insane. localpath shouldn't have parameters
-		# RP: Scehdule for removal with bitbake 1.8.8
-		local = re.sub(';.*$', '', local)
 		local = os.path.realpath(local)
 		ret = oe_unpack_file(local, localdata, url)
 		if not ret:
@@ -877,14 +873,6 @@ python () {
     base_after_parse(d)
 }
 
-# Remove me when we switch to bitbake 1.8.8
-def base_get_srcrev(d):
-    import bb
-    
-    if hasattr(bb.fetch, "get_srcrev"):
-        return bb.fetch.get_srcrev(d)
-    return "NOT IMPLEMENTED"
-
 # Patch handling
 inherit patch
 
============================================================
--- classes/rm_work.bbclass	ee47e8ab4e8989bafbb4ab34525d27fa9ea12103
+++ classes/rm_work.bbclass	e7bd77dd0dc1cf9bd9e2b63fb4bbb5351e7b1ebe
@@ -20,9 +20,7 @@ do_rm_work () {
         fi
     done
 }
-# Uncomment me when we can use bitbake 1.8.8
-#addtask rm_work after do_${RMWORK_ORIG_TASK}
-addtask rm_work after do_build
+addtask rm_work after do_${RMWORK_ORIG_TASK}
 
 do_rm_work_all () {
 	:
============================================================
--- conf/bitbake.conf	d345b97ed205e335f85c0528040d80119f07236d
+++ conf/bitbake.conf	27f28821d89de0f8fab490644ac698eedc27f811
@@ -383,7 +383,7 @@ SRCDATE = "${DATE}"
 UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
 UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
 SRCDATE = "${DATE}"
-SRCREV = "${@base_get_srcrev(d)}"
+SRCREV = "${@bb.fetch.get_srcrev(d)}"
 AUTOREV = "${@bb.fetch.get_srcrev(d)}"
 
 SRC_URI = "file://${FILE}"