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/kernel-uimage.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/kernel-uimage.bbclass')
-rw-r--r-- | meta/classes/kernel-uimage.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/kernel-uimage.bbclass b/meta/classes/kernel-uimage.bbclass index 340503a2d6..7e7185f903 100644 --- a/meta/classes/kernel-uimage.bbclass +++ b/meta/classes/kernel-uimage.bbclass | |||
@@ -1,8 +1,8 @@ | |||
1 | inherit kernel-uboot | 1 | inherit kernel-uboot |
2 | 2 | ||
3 | python __anonymous () { | 3 | python __anonymous () { |
4 | if "uImage" in (d.getVar('KERNEL_IMAGETYPES', True) or "").split(): | 4 | if "uImage" in (d.getVar('KERNEL_IMAGETYPES') or "").split(): |
5 | depends = d.getVar("DEPENDS", True) | 5 | depends = d.getVar("DEPENDS") |
6 | depends = "%s u-boot-mkimage-native" % depends | 6 | depends = "%s u-boot-mkimage-native" % depends |
7 | d.setVar("DEPENDS", depends) | 7 | d.setVar("DEPENDS", depends) |
8 | 8 | ||
@@ -11,8 +11,8 @@ python __anonymous () { | |||
11 | # to build uImage using the kernel build system if and only if | 11 | # to build uImage using the kernel build system if and only if |
12 | # KEEPUIMAGE == yes. Otherwise, we pack compressed vmlinux into | 12 | # KEEPUIMAGE == yes. Otherwise, we pack compressed vmlinux into |
13 | # the uImage . | 13 | # the uImage . |
14 | if d.getVar("KEEPUIMAGE", True) != 'yes': | 14 | if d.getVar("KEEPUIMAGE") != 'yes': |
15 | typeformake = d.getVar("KERNEL_IMAGETYPE_FOR_MAKE", True) or "" | 15 | typeformake = d.getVar("KERNEL_IMAGETYPE_FOR_MAKE") or "" |
16 | if "uImage" in typeformake.split(): | 16 | if "uImage" in typeformake.split(): |
17 | d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake.replace('uImage', 'vmlinux')) | 17 | d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake.replace('uImage', 'vmlinux')) |
18 | } | 18 | } |