summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes')
-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() {
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)