mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 14:59:55 +00:00
Code Issues Projects Releases Wiki Activity

meta-networking: remove True option to getVar calls (again)

Browse Source 
A couple have still been missed in the past despite multiple
attempts at doing so (or simply have re-appeared?).

Search & replace made using the following command:
    sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \
        -i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \
             | cut -d':' -f1 \
             | sort -u)

Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
André Draszik
2019-01-13 10:55:11 +00:00
committed by Khem Raj
parent 88f2b979ca
commit 24af1f974c
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb
+1 -1
View File
@@ -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
meta-networking/recipes-connectivity/samba/samba_4.8.4.bb
+3 -3
View File
@@ -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)
meta-networking/recipes-support/nis/nis.inc
+1 -1
View File
@@ -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")
}
meta-networking/recipes-support/strongswan/strongswan_5.7.1.bb
+3 -3
View File
@@ -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))