From a5ecd90543b0842555662ea92e129d78e6f8c08b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 10 Jul 2018 07:06:01 +0000 Subject: meta-ti: cleanup use of d.getVar() 1. drop use of True as second parameter, which is default, to align with master 2. there were instances of incorrectly passing 'd' as second parameter from previous conversion from bb.data.getVar() usage Signed-off-by: Denys Dmytriyenko --- recipes-ti/devtools/ti-cgt6x_8.2.2.bb | 8 ++++---- recipes-ti/includes/ti-unpack.inc | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'recipes-ti') diff --git a/recipes-ti/devtools/ti-cgt6x_8.2.2.bb b/recipes-ti/devtools/ti-cgt6x_8.2.2.bb index 04e55ae9..53f52526 100644 --- a/recipes-ti/devtools/ti-cgt6x_8.2.2.bb +++ b/recipes-ti/devtools/ti-cgt6x_8.2.2.bb @@ -13,14 +13,14 @@ COMPATIBLE_HOST_class-target = "arm.*-linux" # For now we only have hardfp version for target class python __anonymous() { - c = d.getVar("CLASSOVERRIDE", d, 1) + c = d.getVar("CLASSOVERRIDE") if c == "class-target": - tunes = d.getVar("TUNE_FEATURES", d, 1) + tunes = d.getVar("TUNE_FEATURES") if not tunes: return - pkgn = d.getVar("PN", d, 1) - pkgv = d.getVar("PV", d, 1) + pkgn = d.getVar("PN") + pkgv = d.getVar("PV") if "callconvention-hard" not in tunes: bb.warn("%s-%s ONLY supports hardfp mode for now" % (pkgn, pkgv)) raise bb.parse.SkipPackage("%s-%s ONLY supports hardfp mode for now" % (pkgn, pkgv)) diff --git a/recipes-ti/includes/ti-unpack.inc b/recipes-ti/includes/ti-unpack.inc index cc315dff..a571fd5d 100644 --- a/recipes-ti/includes/ti-unpack.inc +++ b/recipes-ti/includes/ti-unpack.inc @@ -29,21 +29,21 @@ python ti_bin_do_unpack() { localdata = bb.data.createCopy(d) bb.data.update_data(localdata) - binfile = d.getVar('BINFILE', localdata) + binfile = localdata.getVar('BINFILE') binfile = bb.data.expand(binfile, localdata) # Change to the working directory save_cwd = os.getcwd() - workdir = d.getVar('WORKDIR', localdata) + workdir = localdata.getVar('WORKDIR') workdir = bb.data.expand(workdir, localdata) os.chdir(workdir) # Get unpack args - arg_string = d.getVar('TI_BIN_UNPK_ARGS', localdata) + arg_string = localdata.getVar('TI_BIN_UNPK_ARGS') arg_string = bb.data.expand(arg_string, localdata) # Get unpack commands - cmd_string = d.getVar('TI_BIN_UNPK_CMDS', localdata) + cmd_string = localdata.getVar('TI_BIN_UNPK_CMDS') cmd_list = cmd_string.split( ":" ) # Make the InstallJammer binary executable so we can run it @@ -61,14 +61,14 @@ python ti_bin_do_unpack() { f = os.popen(filename,'w') for cmd in cmd_list: if cmd == "workdir": - wdext = d.getVar('TI_BIN_UNPK_WDEXT', localdata) + wdext = localdata.getVar('TI_BIN_UNPK_WDEXT') wdext = bb.data.expand(wdext, localdata) cmd = workdir+wdext f.write(cmd+'\n'); f.close() # Expand the tarball that was created if required - tarfile = d.getVar('TARFILE', localdata) + tarfile = localdata.getVar('TARFILE') if bool(tarfile) == True: tarfile = bb.data.expand(tarfile, localdata) tcmd = 'tar x --no-same-owner -f %s -C %s' % (tarfile, workdir) -- cgit v1.2.3-54-g00ecf