summaryrefslogtreecommitdiffstats
path: root/meta/classes/license.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-01 08:52:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-01 15:51:42 +0100
commit554c892ccf16ca564e7be94f84eaa73667170e15 (patch)
tree01b74616570ebd473abf6bb287cdfcfbd797d41b /meta/classes/license.bbclass
parent6d9e3a19384cbd737fdac729c6c0de5b06f8ec12 (diff)
downloadpoky-554c892ccf16ca564e7be94f84eaa73667170e15.tar.gz
meta: Don't use deprecated bitbake API
These have been deprecated for a long time, convert the remaining references to the correct modules and prepare for removal of the compatibility support from bitbake. (From OE-Core rev: 6a39835af2b2b3c7797fe05479341d71a3f3aaf6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/license.bbclass')
-rw-r--r--meta/classes/license.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 2ca47cc198..621c1b2f55 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -129,9 +129,9 @@ def add_package_and_files(d):
129 d.setVar('RRECOMMENDS_' + pn, "%s" % (pn_lic)) 129 d.setVar('RRECOMMENDS_' + pn, "%s" % (pn_lic))
130 130
131def copy_license_files(lic_files_paths, destdir): 131def copy_license_files(lic_files_paths, destdir):
132 bb.mkdirhier(destdir) 132 bb.utils.mkdirhier(destdir)
133 for (basename, path) in lic_files_paths: 133 for (basename, path) in lic_files_paths:
134 ret = bb.copyfile(path, os.path.join(destdir, basename)) 134 ret = bb.utils.copyfile(path, os.path.join(destdir, basename))
135 # If the copy didn't occur, something horrible went wrong and we fail out 135 # If the copy didn't occur, something horrible went wrong and we fail out
136 if not ret: 136 if not ret:
137 bb.warn("%s could not be copied for some reason. It may not exist. WARN for now." % path) 137 bb.warn("%s could not be copied for some reason. It may not exist. WARN for now." % path)
@@ -188,7 +188,7 @@ def find_license_files(d):
188 188
189 def find_license(license_type): 189 def find_license(license_type):
190 try: 190 try:
191 bb.mkdirhier(gen_lic_dest) 191 bb.utils.mkdirhier(gen_lic_dest)
192 except: 192 except:
193 pass 193 pass
194 spdx_generic = None 194 spdx_generic = None
@@ -227,7 +227,7 @@ def find_license_files(d):
227 return lic_files_paths 227 return lic_files_paths
228 228
229 for url in lic_files.split(): 229 for url in lic_files.split():
230 (type, host, path, user, pswd, parm) = bb.decodeurl(url) 230 (type, host, path, user, pswd, parm) = bb.fetch.decodeurl(url)
231 # We want the license filename and path 231 # We want the license filename and path
232 srclicfile = os.path.join(srcdir, path) 232 srclicfile = os.path.join(srcdir, path)
233 lic_files_paths.append((os.path.basename(path), srclicfile)) 233 lic_files_paths.append((os.path.basename(path), srclicfile))