diff options
author | Denys Dmytriyenko <denys@ti.com> | 2016-12-21 04:35:22 +0000 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2016-12-21 13:23:11 -0500 |
commit | 16a794009702db32c6c6570cda656e9732858573 (patch) | |
tree | 39253c90744975ce21eee84491f18ef185118e9a /recipes-ti/includes | |
parent | d8827afedc66b610f1fc9c5990bc4271917643b6 (diff) | |
download | meta-ti-16a794009702db32c6c6570cda656e9732858573.tar.gz |
remaining recipes: fix build issue due to bb.data.* deprecation
Causes following error:
Exception: AttributeError: module 'bb.data' has no attribute 'getVar'
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-ti/includes')
-rw-r--r-- | recipes-ti/includes/ti-unpack.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-ti/includes/ti-unpack.inc b/recipes-ti/includes/ti-unpack.inc index 1922db6e..cc315dff 100644 --- a/recipes-ti/includes/ti-unpack.inc +++ b/recipes-ti/includes/ti-unpack.inc | |||
@@ -29,21 +29,21 @@ python ti_bin_do_unpack() { | |||
29 | localdata = bb.data.createCopy(d) | 29 | localdata = bb.data.createCopy(d) |
30 | bb.data.update_data(localdata) | 30 | bb.data.update_data(localdata) |
31 | 31 | ||
32 | binfile = bb.data.getVar('BINFILE', localdata) | 32 | binfile = d.getVar('BINFILE', localdata) |
33 | binfile = bb.data.expand(binfile, localdata) | 33 | binfile = bb.data.expand(binfile, localdata) |
34 | 34 | ||
35 | # Change to the working directory | 35 | # Change to the working directory |
36 | save_cwd = os.getcwd() | 36 | save_cwd = os.getcwd() |
37 | workdir = bb.data.getVar('WORKDIR', localdata) | 37 | workdir = d.getVar('WORKDIR', localdata) |
38 | workdir = bb.data.expand(workdir, localdata) | 38 | workdir = bb.data.expand(workdir, localdata) |
39 | os.chdir(workdir) | 39 | os.chdir(workdir) |
40 | 40 | ||
41 | # Get unpack args | 41 | # Get unpack args |
42 | arg_string = bb.data.getVar('TI_BIN_UNPK_ARGS', localdata) | 42 | arg_string = d.getVar('TI_BIN_UNPK_ARGS', localdata) |
43 | arg_string = bb.data.expand(arg_string, localdata) | 43 | arg_string = bb.data.expand(arg_string, localdata) |
44 | 44 | ||
45 | # Get unpack commands | 45 | # Get unpack commands |
46 | cmd_string = bb.data.getVar('TI_BIN_UNPK_CMDS', localdata) | 46 | cmd_string = d.getVar('TI_BIN_UNPK_CMDS', localdata) |
47 | cmd_list = cmd_string.split( ":" ) | 47 | cmd_list = cmd_string.split( ":" ) |
48 | 48 | ||
49 | # Make the InstallJammer binary executable so we can run it | 49 | # Make the InstallJammer binary executable so we can run it |
@@ -61,14 +61,14 @@ python ti_bin_do_unpack() { | |||
61 | f = os.popen(filename,'w') | 61 | f = os.popen(filename,'w') |
62 | for cmd in cmd_list: | 62 | for cmd in cmd_list: |
63 | if cmd == "workdir": | 63 | if cmd == "workdir": |
64 | wdext = bb.data.getVar('TI_BIN_UNPK_WDEXT', localdata) | 64 | wdext = d.getVar('TI_BIN_UNPK_WDEXT', localdata) |
65 | wdext = bb.data.expand(wdext, localdata) | 65 | wdext = bb.data.expand(wdext, localdata) |
66 | cmd = workdir+wdext | 66 | cmd = workdir+wdext |
67 | f.write(cmd+'\n'); | 67 | f.write(cmd+'\n'); |
68 | f.close() | 68 | f.close() |
69 | 69 | ||
70 | # Expand the tarball that was created if required | 70 | # Expand the tarball that was created if required |
71 | tarfile = bb.data.getVar('TARFILE', localdata) | 71 | tarfile = d.getVar('TARFILE', localdata) |
72 | if bool(tarfile) == True: | 72 | if bool(tarfile) == True: |
73 | tarfile = bb.data.expand(tarfile, localdata) | 73 | tarfile = bb.data.expand(tarfile, localdata) |
74 | tcmd = 'tar x --no-same-owner -f %s -C %s' % (tarfile, workdir) | 74 | tcmd = 'tar x --no-same-owner -f %s -C %s' % (tarfile, workdir) |