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-bsp | |
| 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-bsp')
| -rw-r--r-- | meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-bsp/grub/grub-efi_2.00.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-bsp/u-boot/u-boot.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb index e0d8ee76dd..9ddc4ba716 100644 --- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb +++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb | |||
| @@ -27,7 +27,7 @@ COMPATIBLE_HOST_armv4 = 'null' | |||
| 27 | 27 | ||
| 28 | def gnu_efi_arch(d): | 28 | def gnu_efi_arch(d): |
| 29 | import re | 29 | import re |
| 30 | tarch = d.getVar("TARGET_ARCH", True) | 30 | tarch = d.getVar("TARGET_ARCH") |
| 31 | if re.match("i[3456789]86", tarch): | 31 | if re.match("i[3456789]86", tarch): |
| 32 | return "ia32" | 32 | return "ia32" |
| 33 | return tarch | 33 | return tarch |
diff --git a/meta/recipes-bsp/grub/grub-efi_2.00.bb b/meta/recipes-bsp/grub/grub-efi_2.00.bb index 5a0dc954a3..531482b915 100644 --- a/meta/recipes-bsp/grub/grub-efi_2.00.bb +++ b/meta/recipes-bsp/grub/grub-efi_2.00.bb | |||
| @@ -13,7 +13,7 @@ S = "${WORKDIR}/grub-${PV}" | |||
| 13 | # Determine the target arch for the grub modules | 13 | # Determine the target arch for the grub modules |
| 14 | python __anonymous () { | 14 | python __anonymous () { |
| 15 | import re | 15 | import re |
| 16 | target = d.getVar('TARGET_ARCH', True) | 16 | target = d.getVar('TARGET_ARCH') |
| 17 | if target == "x86_64": | 17 | if target == "x86_64": |
| 18 | grubtarget = 'x86_64' | 18 | grubtarget = 'x86_64' |
| 19 | grubimage = "bootx64.efi" | 19 | grubimage = "bootx64.efi" |
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index afe3fe91f2..4a55fd6b4a 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc | |||
| @@ -42,7 +42,7 @@ UBOOT_ELF_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_ELF_SUFFIX}" | |||
| 42 | # deploy directory. For those versions they can set the following variables | 42 | # deploy directory. For those versions they can set the following variables |
| 43 | # to allow packaging the SPL. | 43 | # to allow packaging the SPL. |
| 44 | SPL_BINARY ?= "" | 44 | SPL_BINARY ?= "" |
| 45 | SPL_BINARYNAME ?= "${@os.path.basename(d.getVar("SPL_BINARY", True))}" | 45 | SPL_BINARYNAME ?= "${@os.path.basename(d.getVar("SPL_BINARY"))}" |
| 46 | SPL_IMAGE ?= "${SPL_BINARYNAME}-${MACHINE}-${PV}-${PR}" | 46 | SPL_IMAGE ?= "${SPL_BINARYNAME}-${MACHINE}-${PV}-${PR}" |
| 47 | SPL_SYMLINK ?= "${SPL_BINARYNAME}-${MACHINE}" | 47 | SPL_SYMLINK ?= "${SPL_BINARYNAME}-${MACHINE}" |
| 48 | 48 | ||
