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/classes/allarch.bbclass | |
| 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/classes/allarch.bbclass')
| -rw-r--r-- | meta/classes/allarch.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/allarch.bbclass b/meta/classes/allarch.bbclass index ddc2a85050..9dce49879a 100644 --- a/meta/classes/allarch.bbclass +++ b/meta/classes/allarch.bbclass | |||
| @@ -11,7 +11,7 @@ PACKAGE_ARCH = "all" | |||
| 11 | python () { | 11 | python () { |
| 12 | # Allow this class to be included but overridden - only set | 12 | # Allow this class to be included but overridden - only set |
| 13 | # the values if we're still "all" package arch. | 13 | # the values if we're still "all" package arch. |
| 14 | if d.getVar("PACKAGE_ARCH", True) == "all": | 14 | if d.getVar("PACKAGE_ARCH") == "all": |
| 15 | # No need for virtual/libc or a cross compiler | 15 | # No need for virtual/libc or a cross compiler |
| 16 | d.setVar("INHIBIT_DEFAULT_DEPS","1") | 16 | d.setVar("INHIBIT_DEFAULT_DEPS","1") |
| 17 | 17 | ||
| @@ -47,6 +47,6 @@ python () { | |||
| 47 | d.setVarFlag("emit_pkgdata", "vardepsexclude", "MULTILIB_VARIANTS") | 47 | d.setVarFlag("emit_pkgdata", "vardepsexclude", "MULTILIB_VARIANTS") |
| 48 | d.setVarFlag("write_specfile", "vardepsexclude", "MULTILIBS") | 48 | d.setVarFlag("write_specfile", "vardepsexclude", "MULTILIBS") |
| 49 | elif bb.data.inherits_class('packagegroup', d) and not bb.data.inherits_class('nativesdk', d): | 49 | elif bb.data.inherits_class('packagegroup', d) and not bb.data.inherits_class('nativesdk', d): |
| 50 | bb.error("Please ensure recipe %s sets PACKAGE_ARCH before inherit packagegroup" % d.getVar("FILE", True)) | 50 | bb.error("Please ensure recipe %s sets PACKAGE_ARCH before inherit packagegroup" % d.getVar("FILE")) |
| 51 | } | 51 | } |
| 52 | 52 | ||
