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-oe/recipes-support | |
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-oe/recipes-support')
-rw-r--r-- | meta-oe/recipes-support/atop/atop_2.2.3.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/fltk/fltk_1.3.3.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/libftdi/libftdi_1.3.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/libssh/libssh_0.7.3.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/ne10/ne10_1.2.1.bb | 4 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv_2.4.bb | 4 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv_3.1.bb | 4 | ||||
-rw-r--r-- | meta-oe/recipes-support/openldap/openldap_2.4.44.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/poco/poco_1.7.5.bb | 4 | ||||
-rw-r--r-- | meta-oe/recipes-support/poppler/poppler_0.48.0.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/postgresql/postgresql.inc | 8 | ||||
-rw-r--r-- | meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 10 |
13 files changed, 24 insertions, 24 deletions
diff --git a/meta-oe/recipes-support/atop/atop_2.2.3.bb b/meta-oe/recipes-support/atop/atop_2.2.3.bb index 21311e3540..a36f08dd79 100644 --- a/meta-oe/recipes-support/atop/atop_2.2.3.bb +++ b/meta-oe/recipes-support/atop/atop_2.2.3.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "ncurses zlib" -ATOP_VER = "${@'-'.join(d.getVar('PV', True).rsplit('.', 1))}" +ATOP_VER = "${@'-'.join(d.getVar('PV').rsplit('.', 1))}" SRC_URI = " \ http://www.atoptool.nl/download/${BPN}-${ATOP_VER}.tar.gz \ diff --git a/meta-oe/recipes-support/fltk/fltk_1.3.3.bb b/meta-oe/recipes-support/fltk/fltk_1.3.3.bb index 117ecc366a..efba3a9d2d 100644 --- a/meta-oe/recipes-support/fltk/fltk_1.3.3.bb +++ b/meta-oe/recipes-support/fltk/fltk_1.3.3.bb @@ -41,7 +41,7 @@ do_install_append_class-target() { } python populate_packages_prepend () { - if (d.getVar('DEBIAN_NAMES', 1)): + if (d.getVar('DEBIAN_NAMES')): d.setVar('PKG_${BPN}', 'libfltk${PV}') } diff --git a/meta-oe/recipes-support/libftdi/libftdi_1.3.bb b/meta-oe/recipes-support/libftdi/libftdi_1.3.bb index 5eee0dbf3f..199e5a8f65 100644 --- a/meta-oe/recipes-support/libftdi/libftdi_1.3.bb +++ b/meta-oe/recipes-support/libftdi/libftdi_1.3.bb @@ -24,7 +24,7 @@ PACKAGECONFIG[cpp-wrapper] = "-DFTDI_BUILD_CPP=on -DFTDIPP=on,-DFTDI_BUILD_CPP=o inherit cmake binconfig pkgconfig -EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}" +EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" FILES_${PN}-dev += "${libdir}/cmake" diff --git a/meta-oe/recipes-support/libssh/libssh_0.7.3.bb b/meta-oe/recipes-support/libssh/libssh_0.7.3.bb index c0b8913e1f..6c22649710 100644 --- a/meta-oe/recipes-support/libssh/libssh_0.7.3.bb +++ b/meta-oe/recipes-support/libssh/libssh_0.7.3.bb @@ -16,7 +16,7 @@ EXTRA_OECMAKE = " \ -DWITH_PCAP=1 \ -DWITH_SFTP=1 \ -DWITH_ZLIB=1 \ - -DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')} \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ " PACKAGECONFIG ??="" diff --git a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb index 2fb9d64f59..951086f775 100644 --- a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb +++ b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb @@ -21,10 +21,10 @@ COMPATIBLE_MACHINE_aarch64 = "(.*)" COMPATIBLE_MACHINE_armv7a = "(.*)" python () { - if any(t.startswith('armv7') for t in d.getVar('TUNE_FEATURES', True).split()): + if any(t.startswith('armv7') for t in d.getVar('TUNE_FEATURES').split()): d.setVar('NE10_TARGET_ARCH', 'armv7') bb.debug(2, 'Building Ne10 for armv7') - elif any(t.startswith('aarch64') for t in d.getVar('TUNE_FEATURES', True).split()): + elif any(t.startswith('aarch64') for t in d.getVar('TUNE_FEATURES').split()): d.setVar('NE10_TARGET_ARCH', 'aarch64') bb.debug(2, 'Building Ne10 for aarch64') else: diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb index ced066f563..de2f0529ef 100644 --- a/meta-oe/recipes-support/opencv/opencv_2.4.bb +++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb @@ -65,12 +65,12 @@ python populate_packages_prepend () { do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) - pn = d.getVar('PN', 1) + pn = d.getVar('PN') metapkg = pn + '-dev' d.setVar('ALLOW_EMPTY_' + metapkg, "1") blacklist = [ metapkg ] metapkg_rdepends = [ ] - packages = d.getVar('PACKAGES', 1).split() + packages = d.getVar('PACKAGES').split() for pkg in packages[1:]: if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): metapkg_rdepends.append(pkg) diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb index 74e30e4170..a0dd981317 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb @@ -89,12 +89,12 @@ python populate_packages_prepend () { do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) - pn = d.getVar('PN', 1) + pn = d.getVar('PN') metapkg = pn + '-dev' d.setVar('ALLOW_EMPTY_' + metapkg, "1") blacklist = [ metapkg ] metapkg_rdepends = [ ] - packages = d.getVar('PACKAGES', 1).split() + packages = d.getVar('PACKAGES').split() for pkg in packages[1:]: if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): metapkg_rdepends.append(pkg) diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.44.bb b/meta-oe/recipes-support/openldap/openldap_2.4.44.bb index 05ffc5ce3b..645a5179c7 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.4.44.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.4.44.bb @@ -242,7 +242,7 @@ python populate_packages_prepend () { d.setVar('ALLOW_EMPTY_' + metapkg, "1") d.setVar('FILES_' + metapkg, "") metapkg_rdepends = [] - packages = d.getVar('PACKAGES', 1).split() + packages = d.getVar('PACKAGES').split() for pkg in packages[1:]: if pkg.count("openldap-backend-") and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale"): metapkg_rdepends.append(pkg) diff --git a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb index bd15bba715..8c948c5655 100644 --- a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb +++ b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb @@ -15,7 +15,7 @@ S = "${WORKDIR}/libwbxml-${PV}" inherit cmake pkgconfig -EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}" +EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" PACKAGES += "${PN}-tools" diff --git a/meta-oe/recipes-support/poco/poco_1.7.5.bb b/meta-oe/recipes-support/poco/poco_1.7.5.bb index 0fc50e1549..2cab7960a5 100644 --- a/meta-oe/recipes-support/poco/poco_1.7.5.bb +++ b/meta-oe/recipes-support/poco/poco_1.7.5.bb @@ -62,12 +62,12 @@ PACKAGES = "${PN}-dbg ${POCO_PACKAGES}" python __anonymous () { packages = [] testrunners = [] - components = d.getVar("PACKAGECONFIG", True).split() + components = d.getVar("PACKAGECONFIG").split() components.append("Foundation") for lib in components: pkg = ("poco-%s" % lib.lower()).replace("_","") packages.append(pkg) - if not d.getVar("FILES_%s" % pkg, True): + if not d.getVar("FILES_%s" % pkg): d.setVar("FILES_%s" % pkg, "${libdir}/libPoco%s.so.*" % lib) testrunners.append("%s" % lib) diff --git a/meta-oe/recipes-support/poppler/poppler_0.48.0.bb b/meta-oe/recipes-support/poppler/poppler_0.48.0.bb index c586755644..ebe986b9f1 100644 --- a/meta-oe/recipes-support/poppler/poppler_0.48.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_0.48.0.bb @@ -43,7 +43,7 @@ SRC_URI_append = "${QT4E_PATCHES}" # check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points def get_poppler_fpu_setting(bb, d): - if d.getVar('TARGET_FPU', 1) in [ 'soft' ]: + if d.getVar('TARGET_FPU') in [ 'soft' ]: return "--enable-fixedpoint" return "" diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc b/meta-oe/recipes-support/postgresql/postgresql.inc index 454624caaa..f720cbca27 100644 --- a/meta-oe/recipes-support/postgresql/postgresql.inc +++ b/meta-oe/recipes-support/postgresql/postgresql.inc @@ -91,7 +91,7 @@ python populate_packages_prepend() { fpack="${PN}-" + name + "-dbg" + " " + fpack d.setVar('PACKAGES', fpack) - conf=(d.getVar('PACKAGECONFIG', True) or "").split() + conf=(d.getVar('PACKAGECONFIG') or "").split() pack=d.getVar('PACKAGES', False) or "" bb.debug(1, "PACKAGECONFIG=%s" % conf) bb.debug(1, "PACKAGES1=%s" % pack ) @@ -105,7 +105,7 @@ python populate_packages_prepend() { if "python" in conf: fill_more("plpython") - pack=d.getVar('PACKAGES', True) or "" + pack=d.getVar('PACKAGES') or "" bb.debug(1, "PACKAGES2=%s" % pack) } @@ -191,7 +191,7 @@ do_install_append() { # multiple server config directory install -d -m 700 ${D}${sysconfdir}/default/${BPN} - if [ "${@d.getVar('enable_pam', True)}" = "pam" ]; then + if [ "${@d.getVar('enable_pam')}" = "pam" ]; then install -d ${D}${sysconfdir}/pam.d install -m 644 ${WORKDIR}/postgresql.pam ${D}${sysconfdir}/pam.d/postgresql fi @@ -221,7 +221,7 @@ FILES_${PN} += "${sysconfdir}/init.d/${BPN}-server \ ${libdir}/${BPN}/libpqwalreceiver.so \ ${libdir}/${BPN}/*_and_*.so \ ${@'${sysconfdir}/pam.d/postgresql' \ - if 'pam' == d.getVar('enable_pam', True) \ + if 'pam' == d.getVar('enable_pam') \ else ''} \ " diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index 898e9c2a35..7b56dd4c1b 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -104,17 +104,17 @@ SYSTEMD_SERVICE_${PN} = "${BPN}.service" # no syslog-init for systemd python () { if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): - pn = d.getVar('PN', True) - sysconfdir = d.getVar('sysconfdir', True) + pn = d.getVar('PN') + sysconfdir = d.getVar('sysconfdir') d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init') d.setVarFlag('ALTERNATIVE_PRIORITY', 'syslog-init', '200') d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir)) if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): - pn = d.getVar('PN', True) + pn = d.getVar('PN') d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-service') - d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-service', '%s/systemd/system/syslog.service' % (d.getVar('sysconfdir', True))) - d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-service', '%s/system/${BPN}.service' % (d.getVar('systemd_unitdir', True))) + d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-service', '%s/systemd/system/syslog.service' % (d.getVar('sysconfdir'))) + d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-service', '%s/system/${BPN}.service' % (d.getVar('systemd_unitdir'))) } INITSCRIPT_NAME = "syslog" |