diff options
| -rw-r--r-- | classes/base.bbclass | 12 | ||||
| -rw-r--r-- | classes/rm_work.bbclass | 4 | ||||
| -rw-r--r-- | conf/bitbake.conf | 2 |
3 files changed, 2 insertions, 16 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 304eaecb10..9bcf212e95 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -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 diff --git a/classes/rm_work.bbclass b/classes/rm_work.bbclass index 2ec7d305f2..8569148212 100644 --- a/classes/rm_work.bbclass +++ b/classes/rm_work.bbclass @@ -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 () { : diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 5f8f91240d..a72dd75fdc 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -383,7 +383,7 @@ UPDATECOMMAND = "ERROR, this must be a BitBake bug" 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}" |