diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-01 08:52:40 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-01 15:51:42 +0100 |
| commit | 554c892ccf16ca564e7be94f84eaa73667170e15 (patch) | |
| tree | 01b74616570ebd473abf6bb287cdfcfbd797d41b /meta/classes/archiver.bbclass | |
| parent | 6d9e3a19384cbd737fdac729c6c0de5b06f8ec12 (diff) | |
| download | poky-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/archiver.bbclass')
| -rw-r--r-- | meta/classes/archiver.bbclass | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index e42c419372..66efe7d54b 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass | |||
| @@ -99,7 +99,7 @@ def get_bb_inc(d): | |||
| 99 | licenses = get_licenses(d) | 99 | licenses = get_licenses(d) |
| 100 | script_logs = os.path.join(work_dir, 'script-logs/'+ target_sys + '/' + licenses + '/' + pf + '/script-logs') | 100 | script_logs = os.path.join(work_dir, 'script-logs/'+ target_sys + '/' + licenses + '/' + pf + '/script-logs') |
| 101 | bb_inc = os.path.join(script_logs, 'bb_inc') | 101 | bb_inc = os.path.join(script_logs, 'bb_inc') |
| 102 | bb.mkdirhier(bb_inc) | 102 | bb.utils.mkdirhier(bb_inc) |
| 103 | 103 | ||
| 104 | def find_file(dir, file): | 104 | def find_file(dir, file): |
| 105 | for root, dirs, files in os.walk(dir): | 105 | for root, dirs, files in os.walk(dir): |
| @@ -139,7 +139,7 @@ def get_logs(d): | |||
| 139 | script_logs = os.path.join(work_dir, 'script-logs/'+ target_sys + '/' + licenses + '/' + pf + '/script-logs') | 139 | script_logs = os.path.join(work_dir, 'script-logs/'+ target_sys + '/' + licenses + '/' + pf + '/script-logs') |
| 140 | 140 | ||
| 141 | try: | 141 | try: |
| 142 | bb.mkdirhier(os.path.join(script_logs, 'temp')) | 142 | bb.utils.mkdirhier(os.path.join(script_logs, 'temp')) |
| 143 | oe.path.copytree(os.path.join(work_dir, 'temp'), os.path.join(script_logs, 'temp')) | 143 | oe.path.copytree(os.path.join(work_dir, 'temp'), os.path.join(script_logs, 'temp')) |
| 144 | except (IOError, AttributeError): | 144 | except (IOError, AttributeError): |
| 145 | pass | 145 | pass |
| @@ -158,7 +158,7 @@ def get_series(d): | |||
| 158 | s = d.getVar('S', True) | 158 | s = d.getVar('S', True) |
| 159 | dest = os.path.join(work_dir, pf + '-series') | 159 | dest = os.path.join(work_dir, pf + '-series') |
| 160 | shutil.rmtree(dest, ignore_errors=True) | 160 | shutil.rmtree(dest, ignore_errors=True) |
| 161 | bb.mkdirhier(dest) | 161 | bb.utils.mkdirhier(dest) |
| 162 | 162 | ||
| 163 | src_uri = d.getVar('SRC_URI', True).split() | 163 | src_uri = d.getVar('SRC_URI', True).split() |
| 164 | fetch = bb.fetch2.Fetch(src_uri, d) | 164 | fetch = bb.fetch2.Fetch(src_uri, d) |
| @@ -175,7 +175,7 @@ def get_series(d): | |||
| 175 | shutil.copy(patch, dest) | 175 | shutil.copy(patch, dest) |
| 176 | except IOError: | 176 | except IOError: |
| 177 | if os.path.isdir(patch): | 177 | if os.path.isdir(patch): |
| 178 | bb.mkdirhier(os.path.join(dest, patch)) | 178 | bb.utils.mkdirhier(os.path.join(dest, patch)) |
| 179 | oe.path.copytree(patch, os.path.join(dest, patch)) | 179 | oe.path.copytree(patch, os.path.join(dest, patch)) |
| 180 | return dest | 180 | return dest |
| 181 | 181 | ||
| @@ -190,11 +190,11 @@ def get_applying_patches(d): | |||
| 190 | work_dir = d.getVar('WORKDIR', True) | 190 | work_dir = d.getVar('WORKDIR', True) |
| 191 | dest = os.path.join(work_dir, pf + '-patches') | 191 | dest = os.path.join(work_dir, pf + '-patches') |
| 192 | shutil.rmtree(dest, ignore_errors=True) | 192 | shutil.rmtree(dest, ignore_errors=True) |
| 193 | bb.mkdirhier(dest) | 193 | bb.utils.mkdirhier(dest) |
| 194 | 194 | ||
| 195 | patches = src_patches(d) | 195 | patches = src_patches(d) |
| 196 | for patch in patches: | 196 | for patch in patches: |
| 197 | _, _, local, _, _, parm = bb.decodeurl(patch) | 197 | _, _, local, _, _, parm = bb.fetch.decodeurl(patch) |
| 198 | if local: | 198 | if local: |
| 199 | shutil.copy(local, dest) | 199 | shutil.copy(local, dest) |
| 200 | return dest | 200 | return dest |
| @@ -357,7 +357,7 @@ def move_tarball_deploy(d, tarball_list): | |||
| 357 | work_dir = d.getVar('WORKDIR', True) | 357 | work_dir = d.getVar('WORKDIR', True) |
| 358 | tar_sources = d.getVar('DEPLOY_DIR', True) + '/sources/' + target_sys + '/' + licenses + '/' + pf | 358 | tar_sources = d.getVar('DEPLOY_DIR', True) + '/sources/' + target_sys + '/' + licenses + '/' + pf |
| 359 | if not os.path.exists(tar_sources): | 359 | if not os.path.exists(tar_sources): |
| 360 | bb.mkdirhier(tar_sources) | 360 | bb.utils.mkdirhier(tar_sources) |
| 361 | for source in tarball_list: | 361 | for source in tarball_list: |
| 362 | if source: | 362 | if source: |
| 363 | if os.path.exists(os.path.join(tar_sources, source)): | 363 | if os.path.exists(os.path.join(tar_sources, source)): |
| @@ -459,7 +459,7 @@ def dumpdata(d): | |||
| 459 | licenses = get_licenses(d) | 459 | licenses = get_licenses(d) |
| 460 | dumpdir = os.path.join(workdir, 'diffgz-envdata/'+ target_sys + '/' + licenses + '/' + pf ) | 460 | dumpdir = os.path.join(workdir, 'diffgz-envdata/'+ target_sys + '/' + licenses + '/' + pf ) |
| 461 | if not os.path.exists(dumpdir): | 461 | if not os.path.exists(dumpdir): |
| 462 | bb.mkdirhier(dumpdir) | 462 | bb.utils.mkdirhier(dumpdir) |
| 463 | 463 | ||
| 464 | dumpfile = os.path.join(dumpdir, bb.data.expand("${P}-${PR}.showdata.dump", d)) | 464 | dumpfile = os.path.join(dumpdir, bb.data.expand("${P}-${PR}.showdata.dump", d)) |
| 465 | 465 | ||
| @@ -499,7 +499,7 @@ def create_diff_gz(d): | |||
| 499 | distro = d.getVar('DISTRO',True) or "" | 499 | distro = d.getVar('DISTRO',True) or "" |
| 500 | dest = s + '/' + distro + '/files' | 500 | dest = s + '/' + distro + '/files' |
| 501 | if not os.path.exists(dest): | 501 | if not os.path.exists(dest): |
| 502 | bb.mkdirhier(dest) | 502 | bb.utils.mkdirhier(dest) |
| 503 | for i in os.listdir(os.getcwd()): | 503 | for i in os.listdir(os.getcwd()): |
| 504 | if os.path.isfile(i): | 504 | if os.path.isfile(i): |
| 505 | try: | 505 | try: |
