diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/recipes-devtools/binutils | |
parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz |
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/binutils')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-2.27.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/binutils/binutils.inc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.27.inc b/meta/recipes-devtools/binutils/binutils-2.27.inc index 75180eaf50..df8864cbfa 100644 --- a/meta/recipes-devtools/binutils/binutils-2.27.inc +++ b/meta/recipes-devtools/binutils/binutils-2.27.inc | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM="\ | |||
11 | " | 11 | " |
12 | 12 | ||
13 | def binutils_branch_version(d): | 13 | def binutils_branch_version(d): |
14 | pvsplit = d.getVar('PV', True).split('.') | 14 | pvsplit = d.getVar('PV').split('.') |
15 | return pvsplit[0] + "_" + pvsplit[1] | 15 | return pvsplit[0] + "_" + pvsplit[1] |
16 | 16 | ||
17 | BINUPV = "${@binutils_branch_version(d)}" | 17 | BINUPV = "${@binutils_branch_version(d)}" |
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index 75d190f802..9b1192b6e7 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc | |||
@@ -59,9 +59,9 @@ USE_ALTERNATIVES_FOR = " \ | |||
59 | " | 59 | " |
60 | 60 | ||
61 | python do_package_prepend() { | 61 | python do_package_prepend() { |
62 | make_alts = d.getVar("USE_ALTERNATIVES_FOR", True) or "" | 62 | make_alts = d.getVar("USE_ALTERNATIVES_FOR") or "" |
63 | prefix = d.getVar("TARGET_PREFIX", True) | 63 | prefix = d.getVar("TARGET_PREFIX") |
64 | bindir = d.getVar("bindir", True) | 64 | bindir = d.getVar("bindir") |
65 | for alt in make_alts.split(): | 65 | for alt in make_alts.split(): |
66 | d.setVarFlag('ALTERNATIVE_TARGET', alt, bindir + "/" + prefix + alt) | 66 | d.setVarFlag('ALTERNATIVE_TARGET', alt, bindir + "/" + prefix + alt) |
67 | d.setVarFlag('ALTERNATIVE_LINK_NAME', alt, bindir + "/" + alt) | 67 | d.setVarFlag('ALTERNATIVE_LINK_NAME', alt, bindir + "/" + alt) |