diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-23 12:39:49 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-11-26 01:04:52 +0100 |
commit | d361ef01a9a61cd8a83f7728f7d3e9f118233cb8 (patch) | |
tree | fc87bd4653a60f180ae525fa96f4cb126efd3018 | |
parent | ac2abd467ec0e88e0c3663a55d38d9bfcbfe4618 (diff) | |
download | meta-openembedded-d361ef01a9a61cd8a83f7728f7d3e9f118233cb8.tar.gz |
nis, opencv: Update getVar/setVar syntax
The deprecated APIs are removed from bitbake, update two old style references
in meta-oe/meta-networking.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-networking/recipes-support/nis/nis.inc | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv_3.1.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-networking/recipes-support/nis/nis.inc b/meta-networking/recipes-support/nis/nis.inc index c4aa10e3a2..e027a1c6f8 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 = bb.data.getVar("TARGET_OS", d, 1) | 28 | os = d.getVar("TARGET_OS", True) |
29 | if os == "linux-uclibc": | 29 | if os == "linux-uclibc": |
30 | raise bb.parse.SkipPackage("NIS functionality requires rpcsvc/yp.h, uClibC does not provide this") | 30 | raise bb.parse.SkipPackage("NIS functionality requires rpcsvc/yp.h, uClibC does not provide this") |
31 | } | 31 | } |
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb index a212f4f9d1..74e30e4170 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb | |||
@@ -106,7 +106,7 @@ python populate_packages_prepend () { | |||
106 | for pkg in packages[1:]: | 106 | for pkg in packages[1:]: |
107 | if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale'): | 107 | if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale'): |
108 | metapkg_rdepends.append(pkg) | 108 | metapkg_rdepends.append(pkg) |
109 | bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d) | 109 | d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) |
110 | 110 | ||
111 | } | 111 | } |
112 | 112 | ||