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/nativesdk.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/nativesdk.bbclass')
-rw-r--r-- | meta/classes/nativesdk.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index 31dde4a90f..2ac8fd82ed 100644 --- a/meta/classes/nativesdk.bbclass +++ b/meta/classes/nativesdk.bbclass | |||
@@ -64,17 +64,17 @@ export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig" | |||
64 | export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" | 64 | export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" |
65 | 65 | ||
66 | python nativesdk_virtclass_handler () { | 66 | python nativesdk_virtclass_handler () { |
67 | pn = e.data.getVar("PN", True) | 67 | pn = e.data.getVar("PN") |
68 | if not (pn.endswith("-nativesdk") or pn.startswith("nativesdk-")): | 68 | if not (pn.endswith("-nativesdk") or pn.startswith("nativesdk-")): |
69 | return | 69 | return |
70 | 70 | ||
71 | e.data.setVar("MLPREFIX", "nativesdk-") | 71 | e.data.setVar("MLPREFIX", "nativesdk-") |
72 | e.data.setVar("PN", "nativesdk-" + e.data.getVar("PN", True).replace("-nativesdk", "").replace("nativesdk-", "")) | 72 | e.data.setVar("PN", "nativesdk-" + e.data.getVar("PN").replace("-nativesdk", "").replace("nativesdk-", "")) |
73 | e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-nativesdk") | 73 | e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-nativesdk") |
74 | } | 74 | } |
75 | 75 | ||
76 | python () { | 76 | python () { |
77 | pn = d.getVar("PN", True) | 77 | pn = d.getVar("PN") |
78 | if not pn.startswith("nativesdk-"): | 78 | if not pn.startswith("nativesdk-"): |
79 | return | 79 | return |
80 | 80 | ||
@@ -82,7 +82,7 @@ python () { | |||
82 | 82 | ||
83 | clsextend = oe.classextend.NativesdkClassExtender("nativesdk", d) | 83 | clsextend = oe.classextend.NativesdkClassExtender("nativesdk", d) |
84 | clsextend.rename_packages() | 84 | clsextend.rename_packages() |
85 | clsextend.rename_package_variables((d.getVar("PACKAGEVARS", True) or "").split()) | 85 | clsextend.rename_package_variables((d.getVar("PACKAGEVARS") or "").split()) |
86 | 86 | ||
87 | clsextend.map_depends_variable("DEPENDS") | 87 | clsextend.map_depends_variable("DEPENDS") |
88 | clsextend.map_packagevars() | 88 | clsextend.map_packagevars() |