diff options
| author |   Joshua Lock <joshua.g.lock@intel.com> | 2016-11-25 15:28:52 +0000 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-12-02 09:16:17 +0100 |
| commit | efd3696e70a6603f1a45faa4a172433514f0a487 (patch) | |
| tree | b72751ba93b050391db05a8e1be7506836b6d515 /meta-initramfs | |
| parent | 761639b9d7681c81dd69eaf3a37c32791d6e97fd (diff) | |
| download | meta-openembedded-contrib-efd3696e70a6603f1a45faa4a172433514f0a487.tar.gz | |
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\)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Diffstat (limited to 'meta-initramfs')
3 files changed, 4 insertions, 4 deletions
diff --git a/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb b/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb index da3023fe17..b7a8a9356e 100644 --- a/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb +++ b/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb @@ -7,7 +7,7 @@ SUMMARY = "Initramfs image for kexecboot kernel (klibc-static binaries)" IMAGE_INSTALL = "kexecboot-klibc kexec-klibc ubiattach-klibc" python () { - if d.getVar('TARGET_ARCH', True) == "nios2": + if d.getVar('TARGET_ARCH') == "nios2": raise bb.parse.SkipPackage("'nios2' not supported arch") } diff --git a/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb b/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb index 69f38721b1..085955c139 100644 --- a/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb +++ b/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb @@ -57,4 +57,4 @@ CMDLINE_DEBUG ?= "quiet" INHIBIT_DEFAULT_DEPS = "1" # Note: for qvga the label is currently limited to about 24 chars -KEXECBOOT_LABEL ?= "${@d.getVar('DISTRO', True) or d.getVar('DISTRO_VERSION', True)}-${MACHINE}" +KEXECBOOT_LABEL ?= "${@d.getVar('DISTRO') or d.getVar('DISTRO_VERSION')}-${MACHINE}" diff --git a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb index 2f4afce063..3a4e7b52ad 100644 --- a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb +++ b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb @@ -36,5 +36,5 @@ deltask do_package_write_tar SSTATE_SCAN_FILES = "*" EXTRA_STAGING_FIXMES = "MANGLEDSTAGINGDIRTARGET MANGLEDSTAGINGDIR" -MANGLEDSTAGINGDIR = "${@d.getVar("STAGING_DIR", True).replace("/", "\\\\/").replace("-", "\\\\-")}" -MANGLEDSTAGINGDIRTARGET = "${@d.getVar("STAGING_DIR_TARGET", True).replace("/", "\\\\/").replace("-", "\\\\-")}" +MANGLEDSTAGINGDIR = "${@d.getVar("STAGING_DIR").replace("/", "\\\\/").replace("-", "\\\\-")}" +MANGLEDSTAGINGDIRTARGET = "${@d.getVar("STAGING_DIR_TARGET").replace("/", "\\\\/").replace("-", "\\\\-")}" |