diff options
4 files changed, 8 insertions, 8 deletions
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb index 01562aad16..8f406ff9ca 100644 --- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb @@ -39,7 +39,7 @@ EXTRA_OEMAKE = " \ WITH_BUNDLED_DEPS=no \ " -export LIB_SUFFIX = "${@d.getVar('baselib', True).replace('lib', '')}" +export LIB_SUFFIX = "${@d.getVar('baselib').replace('lib', '')}" do_install() { oe_runmake 'DESTDIR=${D}' install diff --git a/meta-networking/recipes-connectivity/samba/samba_4.8.4.bb b/meta-networking/recipes-connectivity/samba/samba_4.8.4.bb index f1aaeb83d9..e86ed96a5d 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.8.4.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.8.4.bb @@ -193,15 +193,15 @@ PACKAGES =+ "${PN}-python ${PN}-pidl \ python samba_populate_packages() { def module_hook(file, pkg, pattern, format, basename): - pn = d.getVar('PN', True) + pn = d.getVar('PN') d.appendVar('RRECOMMENDS_%s-base' % pn, ' %s' % pkg) - mlprefix = d.getVar('MLPREFIX', True) or '' + mlprefix = d.getVar('MLPREFIX') or '' pam_libdir = d.expand('${base_libdir}/security') pam_pkgname = mlprefix + 'pam-plugin%s' do_split_packages(d, pam_libdir, '^pam_(.*)\.so$', pam_pkgname, 'PAM plugin for %s', extra_depends='', prepend=True) - libdir = d.getVar('libdir', True) + libdir = d.getVar('libdir') do_split_packages(d, libdir, '^lib(.*)\.so\..*$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True, allow_links=True) pkglibdir = '%s/samba' % libdir do_split_packages(d, pkglibdir, '^lib(.*)\.so$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True) diff --git a/meta-networking/recipes-support/nis/nis.inc b/meta-networking/recipes-support/nis/nis.inc index 200eaf74d4..a968af174f 100644 --- a/meta-networking/recipes-support/nis/nis.inc +++ b/meta-networking/recipes-support/nis/nis.inc @@ -25,7 +25,7 @@ do_install() { # so force the package to be skipped here (this will cause a # 'nothing provides' error) python () { - os = d.getVar("TARGET_OS", True) + os = d.getVar("TARGET_OS") if os == "linux-uclibc": raise bb.parse.SkipRecipe("NIS functionality requires rpcsvc/yp.h, uClibC does not provide this") } diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.7.1.bb b/meta-networking/recipes-support/strongswan/strongswan_5.7.1.bb index c8bb17c5ba..5a4e2d36f8 100644 --- a/meta-networking/recipes-support/strongswan/strongswan_5.7.1.bb +++ b/meta-networking/recipes-support/strongswan/strongswan_5.7.1.bb @@ -66,8 +66,8 @@ python split_strongswan_plugins () { dbglibdir = os.path.join(libdir, '.debug') def add_plugin_conf(f, pkg, file_regex, output_pattern, modulename): - dvar = d.getVar('PKGD', True) - oldfiles = d.getVar('CONFFILES_' + pkg, True) + dvar = d.getVar('PKGD') + oldfiles = d.getVar('CONFFILES_' + pkg) newfile = '/' + os.path.relpath(f, dvar) if not oldfiles: @@ -83,7 +83,7 @@ python split_strongswan_plugins () { split_staticdev_packages = do_split_packages(d, libdir, 'libstrongswan-(.*)\.a', '${PN}-plugin-%s-staticdev', 'strongSwan %s plugin - Development files (Static Libraries)', prepend=True, extra_depends='${PN}-staticdev') if split_packages: - pn = d.getVar('PN', True) + pn = d.getVar('PN') d.setVar('RRECOMMENDS_' + pn + '-plugins', ' '.join(split_packages)) d.appendVar('RRECOMMENDS_' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages)) d.appendVar('RRECOMMENDS_' + pn + '-dev', ' ' + ' '.join(split_dev_packages)) |