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-support/libiconv | |
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-support/libiconv')
-rw-r--r-- | meta/recipes-support/libiconv/libiconv_1.11.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-support/libiconv/libiconv_1.14.bb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-support/libiconv/libiconv_1.11.1.bb b/meta/recipes-support/libiconv/libiconv_1.11.1.bb index 6ce4b96e33..f28e64ae2e 100644 --- a/meta/recipes-support/libiconv/libiconv_1.11.1.bb +++ b/meta/recipes-support/libiconv/libiconv_1.11.1.bb | |||
@@ -23,7 +23,7 @@ S = "${WORKDIR}/libiconv-${PV}" | |||
23 | inherit autotools pkgconfig gettext | 23 | inherit autotools pkgconfig gettext |
24 | 24 | ||
25 | python __anonymous() { | 25 | python __anonymous() { |
26 | if d.getVar("TCLIBC", True) == "glibc": | 26 | if d.getVar("TCLIBC") == "glibc": |
27 | raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - glibc already provides iconv") | 27 | raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - glibc already provides iconv") |
28 | } | 28 | } |
29 | 29 | ||
diff --git a/meta/recipes-support/libiconv/libiconv_1.14.bb b/meta/recipes-support/libiconv/libiconv_1.14.bb index 1b6fe09bb7..9fd5114ac8 100644 --- a/meta/recipes-support/libiconv/libiconv_1.14.bb +++ b/meta/recipes-support/libiconv/libiconv_1.14.bb | |||
@@ -23,9 +23,9 @@ S = "${WORKDIR}/libiconv-${PV}" | |||
23 | inherit autotools pkgconfig gettext | 23 | inherit autotools pkgconfig gettext |
24 | 24 | ||
25 | python __anonymous() { | 25 | python __anonymous() { |
26 | if d.getVar("TARGET_OS", True) != "linux": | 26 | if d.getVar("TARGET_OS") != "linux": |
27 | return | 27 | return |
28 | if d.getVar("TCLIBC", True) == "glibc": | 28 | if d.getVar("TCLIBC") == "glibc": |
29 | raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - glibc already provides iconv") | 29 | raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - glibc already provides iconv") |
30 | } | 30 | } |
31 | 31 | ||