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 /meta-networking/recipes-support | |
| 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>
Diffstat (limited to 'meta-networking/recipes-support')
| -rw-r--r-- | meta-networking/recipes-support/nis/nis.inc | 2 | ||||
| -rw-r--r-- | meta-networking/recipes-support/strongswan/strongswan_5.7.1.bb | 6 |
2 files changed, 4 insertions, 4 deletions
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)) |
