From c4e2c59088765d1f1de7ec57cde91980f887c2ff 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\) (From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f) Signed-off-by: Joshua Lock Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-support/attr/ea-acl.inc | 8 ++++---- meta/recipes-support/boost/boost-1.62.0.inc | 4 ++-- meta/recipes-support/boost/boost.inc | 8 ++++---- meta/recipes-support/gnutls/gnutls.inc | 2 +- meta/recipes-support/icu/icu_58.1.bb | 2 +- meta/recipes-support/libiconv/libiconv_1.11.1.bb | 2 +- meta/recipes-support/libiconv/libiconv_1.14.bb | 4 ++-- meta/recipes-support/libnl/libnl_3.2.28.bb | 2 +- meta/recipes-support/libsoup/libsoup-2.4_2.56.0.bb | 2 +- meta/recipes-support/sqlite/sqlite3.inc | 2 +- meta/recipes-support/taglib/taglib_1.11.1.bb | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc index 583ca1f84c..8750c3bc64 100644 --- a/meta/recipes-support/attr/ea-acl.inc +++ b/meta/recipes-support/attr/ea-acl.inc @@ -21,8 +21,8 @@ do_install_append_class-native () { if test "${libdir}" = "${base_libdir}" ; then return fi - librelpath=${@os.path.relpath(d.getVar('libdir',True), d.getVar('base_libdir', True))} - baselibrelpath=${@os.path.relpath(d.getVar('base_libdir',True), d.getVar('libdir', True))} + librelpath=${@os.path.relpath(d.getVar('libdir',True), d.getVar('base_libdir'))} + baselibrelpath=${@os.path.relpath(d.getVar('base_libdir',True), d.getVar('libdir'))} # Remove bad symlinks & create the correct symlinks if test -L ${D}${libdir}/lib${BPN}.so ; then @@ -45,5 +45,5 @@ FILES_lib${BPN} = "${base_libdir}/lib*${SOLIBS}" BBCLASSEXTEND = "native" # Only append ldflags for target recipe and if USE_NLS is enabled -LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl '][(d.getVar('USE_NLS', True) == 'yes')]}" -EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS', True) == 'no')]}" +LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl '][(d.getVar('USE_NLS') == 'yes')]}" +EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS') == 'no')]}" diff --git a/meta/recipes-support/boost/boost-1.62.0.inc b/meta/recipes-support/boost/boost-1.62.0.inc index 1e555e19bf..1138de61f1 100644 --- a/meta/recipes-support/boost/boost-1.62.0.inc +++ b/meta/recipes-support/boost/boost-1.62.0.inc @@ -7,8 +7,8 @@ HOMEPAGE = "http://www.boost.org/" LICENSE = "BSL-1.0 & MIT & Python-2.0" LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -BOOST_VER = "${@"_".join(d.getVar("PV", True).split("."))}" -BOOST_MAJ = "${@"_".join(d.getVar("PV", True).split(".")[0:2])}" +BOOST_VER = "${@"_".join(d.getVar("PV").split("."))}" +BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2" diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index 1966d3d807..a1a6a90f9c 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -59,7 +59,7 @@ PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}" python __anonymous () { packages = [] extras = [] - for lib in d.getVar('BOOST_LIBS', True).split( ): + for lib in d.getVar('BOOST_LIBS').split( ): # BJAM does not know '--with-python3' (only --with-python) if lib != "python3": extras.append("--with-%s" % lib) @@ -67,10 +67,10 @@ python __anonymous () { packages.append(pkg) if lib == "python": # special: python*.so matches python3.so !! - if not d.getVar("FILES_%s" % pkg, True): + if not d.getVar("FILES_%s" % pkg): d.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s.so.*" % lib) else: - if not d.getVar("FILES_%s" % pkg, True): + if not d.getVar("FILES_%s" % pkg): d.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so.*" % lib) d.setVar("BOOST_PACKAGES", " ".join(packages)) d.setVar("BJAM_EXTRA", " ".join(extras)) @@ -145,7 +145,7 @@ BJAM_TOOLS = "--ignore-site-config \ # use PARALLEL_MAKE to speed up the build, but limit it by -j 64, greater parallelism causes bjam to segfault or to ignore -j # https://svn.boost.org/trac/boost/ticket/7634 def get_boost_parallel_make(d): - pm = d.getVar('PARALLEL_MAKE', True) + pm = d.getVar('PARALLEL_MAKE') if pm: # look for '-j' and throw other options (e.g. '-l') away # because they might have different meaning in bjam diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index 51b9d2b191..4a5c3dfebf 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \ DEPENDS = "nettle gmp virtual/libiconv" DEPENDS_append_libc-musl = " argp-standalone" -SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split('.')[1]}" +SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz" diff --git a/meta/recipes-support/icu/icu_58.1.bb b/meta/recipes-support/icu/icu_58.1.bb index cc7c94707b..9243a6a173 100644 --- a/meta/recipes-support/icu/icu_58.1.bb +++ b/meta/recipes-support/icu/icu_58.1.bb @@ -3,7 +3,7 @@ require icu.inc LIC_FILES_CHKSUM = "file://../LICENSE;md5=1b3b75c1777cd49ad5c6a24cd338cfc9" def icu_download_version(d): - pvsplit = d.getVar('PV', True).split('.') + pvsplit = d.getVar('PV').split('.') return pvsplit[0] + "_" + pvsplit[1] ICU_PV = "${@icu_download_version(d)}" diff --git a/meta/recipes-support/libiconv/libiconv_1.11.1.bb b/meta/recipes-support/libiconv/libiconv_1.11.1.bb index 6ce4b96e33..f28e64ae2e 100644 --- a/meta/recipes-support/libiconv/libiconv_1.11.1.bb +++ b/meta/recipes-support/libiconv/libiconv_1.11.1.bb @@ -23,7 +23,7 @@ S = "${WORKDIR}/libiconv-${PV}" inherit autotools pkgconfig gettext python __anonymous() { - if d.getVar("TCLIBC", True) == "glibc": + if d.getVar("TCLIBC") == "glibc": raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - glibc already provides iconv") } diff --git a/meta/recipes-support/libiconv/libiconv_1.14.bb b/meta/recipes-support/libiconv/libiconv_1.14.bb index 1b6fe09bb7..9fd5114ac8 100644 --- a/meta/recipes-support/libiconv/libiconv_1.14.bb +++ b/meta/recipes-support/libiconv/libiconv_1.14.bb @@ -23,9 +23,9 @@ S = "${WORKDIR}/libiconv-${PV}" inherit autotools pkgconfig gettext python __anonymous() { - if d.getVar("TARGET_OS", True) != "linux": + if d.getVar("TARGET_OS") != "linux": return - if d.getVar("TCLIBC", True) == "glibc": + if d.getVar("TCLIBC") == "glibc": raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - glibc already provides iconv") } diff --git a/meta/recipes-support/libnl/libnl_3.2.28.bb b/meta/recipes-support/libnl/libnl_3.2.28.bb index 26982f3efb..04e2d18f79 100644 --- a/meta/recipes-support/libnl/libnl_3.2.28.bb +++ b/meta/recipes-support/libnl/libnl_3.2.28.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "flex-native bison-native" -SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV', True).replace('.','_')}/${BP}.tar.gz \ +SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \ file://fix-pktloc_syntax_h-race.patch \ file://fix-pc-file.patch \ file://0001-lib-add-utility-function-nl_strerror_l.patch \ diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.56.0.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.56.0.bb index 16c6068109..a1f294efbf 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.56.0.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.56.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 intltool-native" -SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split('.')[1]}" +SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc index 80424c9cd6..42b534d8ef 100644 --- a/meta/recipes-support/sqlite/sqlite3.inc +++ b/meta/recipes-support/sqlite/sqlite3.inc @@ -5,7 +5,7 @@ SECTION = "libs" PE = "3" def sqlite_download_version(d): - pvsplit = d.getVar('PV', True).split('.') + pvsplit = d.getVar('PV').split('.') if len(pvsplit) < 4: pvsplit.append('0') return pvsplit[0] + ''.join([part.rjust(2,'0') for part in pvsplit[1:]]) diff --git a/meta/recipes-support/taglib/taglib_1.11.1.bb b/meta/recipes-support/taglib/taglib_1.11.1.bb index ee1b5234bb..54a92d94ec 100644 --- a/meta/recipes-support/taglib/taglib_1.11.1.bb +++ b/meta/recipes-support/taglib/taglib_1.11.1.bb @@ -26,7 +26,7 @@ EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON \ -DHAVE_BOOST_BYTESWAP=FALSE \ -DCMAKE_CXX_STANDARD=11 \ -DCMAKE_CXX_STANDARD_REQUIRED=OFF \ - -DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')} \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ " CXXFLAGS += "-std=c++11" -- cgit v1.2.3-54-g00ecf