From 7c552996597faaee2fbee185b250c0ee30ea3b5f Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 14 Dec 2016 21:13:04 +0000 Subject: 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\) Signed-off-by: Joshua Lock Signed-off-by: Ross Burton --- meta/recipes-devtools/cmake/cmake.inc | 2 +- meta/recipes-devtools/cmake/cmake_3.7.0.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-devtools/cmake') diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 9ae28900a6..40255d9da3 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -9,7 +9,7 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://Copyright.txt;md5=7a64bc564202bf7401d9a8ef33c9564d \ file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14" -CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV', True).split('.')[0:2])}" +CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://support-oe-qt4-tools-names.patch \ diff --git a/meta/recipes-devtools/cmake/cmake_3.7.0.bb b/meta/recipes-devtools/cmake/cmake_3.7.0.bb index 58c6615680..787f33c02b 100644 --- a/meta/recipes-devtools/cmake/cmake_3.7.0.bb +++ b/meta/recipes-devtools/cmake/cmake_3.7.0.bb @@ -10,8 +10,8 @@ SRC_URI_append_class-nativesdk = " \ # Strip ${prefix} from ${docdir}, set result into docdir_stripped python () { - prefix=d.getVar("prefix", True) - docdir=d.getVar("docdir", True) + prefix=d.getVar("prefix") + docdir=d.getVar("docdir") if not docdir.startswith(prefix): bb.fatal('docdir must contain prefix as its prefix') -- cgit 1.2.3-korg