diff options
author | André Draszik <andre.draszik@jci.com> | 2019-01-13 10:55:11 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-01-13 10:28:01 -0800 |
commit | 24af1f974cc95c50dfa56ad15b113279c3993c5d (patch) | |
tree | 40a09c3734718cf88b34e4c3b991ae11360fdee8 | |
parent | 88f2b979caf24fad736b8e378cf9daa142ae0567 (diff) | |
download | meta-openembedded-24af1f974cc95c50dfa56ad15b113279c3993c5d.tar.gz |
meta-networking: remove True option to getVar calls (again)
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>
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 = " \ | |||
39 | WITH_BUNDLED_DEPS=no \ | 39 | WITH_BUNDLED_DEPS=no \ |
40 | " | 40 | " |
41 | 41 | ||
42 | export LIB_SUFFIX = "${@d.getVar('baselib', True).replace('lib', '')}" | 42 | export LIB_SUFFIX = "${@d.getVar('baselib').replace('lib', '')}" |
43 | 43 | ||
44 | do_install() { | 44 | do_install() { |
45 | oe_runmake 'DESTDIR=${D}' install | 45 | 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 \ | |||
193 | 193 | ||
194 | python samba_populate_packages() { | 194 | python samba_populate_packages() { |
195 | def module_hook(file, pkg, pattern, format, basename): | 195 | def module_hook(file, pkg, pattern, format, basename): |
196 | pn = d.getVar('PN', True) | 196 | pn = d.getVar('PN') |
197 | d.appendVar('RRECOMMENDS_%s-base' % pn, ' %s' % pkg) | 197 | d.appendVar('RRECOMMENDS_%s-base' % pn, ' %s' % pkg) |
198 | 198 | ||
199 | mlprefix = d.getVar('MLPREFIX', True) or '' | 199 | mlprefix = d.getVar('MLPREFIX') or '' |
200 | pam_libdir = d.expand('${base_libdir}/security') | 200 | pam_libdir = d.expand('${base_libdir}/security') |
201 | pam_pkgname = mlprefix + 'pam-plugin%s' | 201 | pam_pkgname = mlprefix + 'pam-plugin%s' |
202 | do_split_packages(d, pam_libdir, '^pam_(.*)\.so$', pam_pkgname, 'PAM plugin for %s', extra_depends='', prepend=True) | 202 | do_split_packages(d, pam_libdir, '^pam_(.*)\.so$', pam_pkgname, 'PAM plugin for %s', extra_depends='', prepend=True) |
203 | 203 | ||
204 | libdir = d.getVar('libdir', True) | 204 | libdir = d.getVar('libdir') |
205 | do_split_packages(d, libdir, '^lib(.*)\.so\..*$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True, allow_links=True) | 205 | do_split_packages(d, libdir, '^lib(.*)\.so\..*$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True, allow_links=True) |
206 | pkglibdir = '%s/samba' % libdir | 206 | pkglibdir = '%s/samba' % libdir |
207 | do_split_packages(d, pkglibdir, '^lib(.*)\.so$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True) | 207 | 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() { | |||
25 | # so force the package to be skipped here (this will cause a | 25 | # so force the package to be skipped here (this will cause a |
26 | # 'nothing provides' error) | 26 | # 'nothing provides' error) |
27 | python () { | 27 | python () { |
28 | os = d.getVar("TARGET_OS", True) | 28 | os = d.getVar("TARGET_OS") |
29 | if os == "linux-uclibc": | 29 | if os == "linux-uclibc": |
30 | raise bb.parse.SkipRecipe("NIS functionality requires rpcsvc/yp.h, uClibC does not provide this") | 30 | raise bb.parse.SkipRecipe("NIS functionality requires rpcsvc/yp.h, uClibC does not provide this") |
31 | } | 31 | } |
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 () { | |||
66 | dbglibdir = os.path.join(libdir, '.debug') | 66 | dbglibdir = os.path.join(libdir, '.debug') |
67 | 67 | ||
68 | def add_plugin_conf(f, pkg, file_regex, output_pattern, modulename): | 68 | def add_plugin_conf(f, pkg, file_regex, output_pattern, modulename): |
69 | dvar = d.getVar('PKGD', True) | 69 | dvar = d.getVar('PKGD') |
70 | oldfiles = d.getVar('CONFFILES_' + pkg, True) | 70 | oldfiles = d.getVar('CONFFILES_' + pkg) |
71 | newfile = '/' + os.path.relpath(f, dvar) | 71 | newfile = '/' + os.path.relpath(f, dvar) |
72 | 72 | ||
73 | if not oldfiles: | 73 | if not oldfiles: |
@@ -83,7 +83,7 @@ python split_strongswan_plugins () { | |||
83 | 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') | 83 | 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') |
84 | 84 | ||
85 | if split_packages: | 85 | if split_packages: |
86 | pn = d.getVar('PN', True) | 86 | pn = d.getVar('PN') |
87 | d.setVar('RRECOMMENDS_' + pn + '-plugins', ' '.join(split_packages)) | 87 | d.setVar('RRECOMMENDS_' + pn + '-plugins', ' '.join(split_packages)) |
88 | d.appendVar('RRECOMMENDS_' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages)) | 88 | d.appendVar('RRECOMMENDS_' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages)) |
89 | d.appendVar('RRECOMMENDS_' + pn + '-dev', ' ' + ' '.join(split_dev_packages)) | 89 | d.appendVar('RRECOMMENDS_' + pn + '-dev', ' ' + ' '.join(split_dev_packages)) |