summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-25 17:41:17 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-28 14:01:11 +0000
commitad30740b129abd3ac18dd227d36294840856c3ac (patch)
tree18d234d0929b11c4eda142f4ddf5745334407732
parent5ab9d7e28f987fba8bab03bb7851c263f746c208 (diff)
downloadpoky-ad30740b129abd3ac18dd227d36294840856c3ac.tar.gz
poky-ad30740b129abd3ac18dd227d36294840856c3ac.tar.bz2
poky-ad30740b129abd3ac18dd227d36294840856c3ac.zip
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 <richard.purdie@linuxfoundation.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/base.bbclass17
1 files changed, 4 insertions, 13 deletions
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)