From ad30740b129abd3ac18dd227d36294840856c3ac Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 25 Feb 2014 17:41:17 +0000 Subject: base: Remove pointless createCopy/update_data calls I was asked why we had these copy and update_data calls. I can offer no good explanation other than them perhaps once being needed for reasons long since forgotten and superceeded. With modern bitbake these should not be needed and shouldn't have been for a long time. Lets therefore remove them and simplify the code. (From OE-Core rev: 33746924bea27e6f4d85898fe37d3e07d4317a3a) Signed-off-by: Richard Purdie Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'meta/classes/base.bbclass') diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7837c892e5..3e9051cd99 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -106,11 +106,8 @@ python base_do_fetch() { if len(src_uri) == 0: return - localdata = bb.data.createCopy(d) - bb.data.update_data(localdata) - try: - fetcher = bb.fetch2.Fetch(src_uri, localdata) + fetcher = bb.fetch2.Fetch(src_uri, d) fetcher.download() except bb.fetch2.BBFetchException as e: raise bb.build.FuncFailed(e) @@ -124,13 +121,10 @@ python base_do_unpack() { if len(src_uri) == 0: return - localdata = bb.data.createCopy(d) - bb.data.update_data(localdata) - - rootdir = localdata.getVar('WORKDIR', True) + rootdir = d.getVar('WORKDIR', True) try: - fetcher = bb.fetch2.Fetch(src_uri, localdata) + fetcher = bb.fetch2.Fetch(src_uri, d) fetcher.unpack(rootdir) except bb.fetch2.BBFetchException as e: raise bb.build.FuncFailed(e) @@ -653,11 +647,8 @@ python do_cleanall() { if len(src_uri) == 0: return - localdata = bb.data.createCopy(d) - bb.data.update_data(localdata) - try: - fetcher = bb.fetch2.Fetch(src_uri, localdata) + fetcher = bb.fetch2.Fetch(src_uri, d) fetcher.clean() except bb.fetch2.BBFetchException, e: raise bb.build.FuncFailed(e) -- cgit v1.2.3-54-g00ecf