diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-25 17:41:17 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-28 14:01:11 +0000 |
commit | ad30740b129abd3ac18dd227d36294840856c3ac (patch) | |
tree | 18d234d0929b11c4eda142f4ddf5745334407732 /meta/classes | |
parent | 5ab9d7e28f987fba8bab03bb7851c263f746c208 (diff) | |
download | poky-ad30740b129abd3ac18dd227d36294840856c3ac.tar.gz |
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>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/base.bbclass | 17 |
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() { | |||
106 | if len(src_uri) == 0: | 106 | if len(src_uri) == 0: |
107 | return | 107 | return |
108 | 108 | ||
109 | localdata = bb.data.createCopy(d) | ||
110 | bb.data.update_data(localdata) | ||
111 | |||
112 | try: | 109 | try: |
113 | fetcher = bb.fetch2.Fetch(src_uri, localdata) | 110 | fetcher = bb.fetch2.Fetch(src_uri, d) |
114 | fetcher.download() | 111 | fetcher.download() |
115 | except bb.fetch2.BBFetchException as e: | 112 | except bb.fetch2.BBFetchException as e: |
116 | raise bb.build.FuncFailed(e) | 113 | raise bb.build.FuncFailed(e) |
@@ -124,13 +121,10 @@ python base_do_unpack() { | |||
124 | if len(src_uri) == 0: | 121 | if len(src_uri) == 0: |
125 | return | 122 | return |
126 | 123 | ||
127 | localdata = bb.data.createCopy(d) | 124 | rootdir = d.getVar('WORKDIR', True) |
128 | bb.data.update_data(localdata) | ||
129 | |||
130 | rootdir = localdata.getVar('WORKDIR', True) | ||
131 | 125 | ||
132 | try: | 126 | try: |
133 | fetcher = bb.fetch2.Fetch(src_uri, localdata) | 127 | fetcher = bb.fetch2.Fetch(src_uri, d) |
134 | fetcher.unpack(rootdir) | 128 | fetcher.unpack(rootdir) |
135 | except bb.fetch2.BBFetchException as e: | 129 | except bb.fetch2.BBFetchException as e: |
136 | raise bb.build.FuncFailed(e) | 130 | raise bb.build.FuncFailed(e) |
@@ -653,11 +647,8 @@ python do_cleanall() { | |||
653 | if len(src_uri) == 0: | 647 | if len(src_uri) == 0: |
654 | return | 648 | return |
655 | 649 | ||
656 | localdata = bb.data.createCopy(d) | ||
657 | bb.data.update_data(localdata) | ||
658 | |||
659 | try: | 650 | try: |
660 | fetcher = bb.fetch2.Fetch(src_uri, localdata) | 651 | fetcher = bb.fetch2.Fetch(src_uri, d) |
661 | fetcher.clean() | 652 | fetcher.clean() |
662 | except bb.fetch2.BBFetchException, e: | 653 | except bb.fetch2.BBFetchException, e: |
663 | raise bb.build.FuncFailed(e) | 654 | raise bb.build.FuncFailed(e) |