[PATCH] nis/opencv: Update getVar/setVar syntax

[PATCH] nis/opencv: Update getVar/setVar syntax

[Richard Purdie]

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>
---
 meta-networking/recipes-support/nis/nis.inc  | 2 +-
 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 c4aa10e..e027a1c 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 = bb.data.getVar("TARGET_OS", d, 1)
+    os = d.getVar("TARGET_OS", True)
     if os == "linux-uclibc":
         raise bb.parse.SkipPackage("NIS functionality requires rpcsvc/yp.h, uClibC does not provide this")
 }
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
index 2136b07..670c94b 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
@@ -108,7 +108,7 @@ python populate_packages_prepend () {
     for pkg in packages[1:]:
         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'):
             metapkg_rdepends.append(pkg)
-    bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d)
+    d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
 
 }
 
-- 
2.7.4

Re: [PATCH] nis/opencv: Update getVar/setVar syntax

[Khem Raj]

On Wed, Nov 23, 2016 at 4:39 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> The deprecated APIs are removed from bitbake, update two old style references
> in meta-oe/meta-networking.
>

Note, that the corresponding change in bitbake is already in, so this
patch needs to be applied quickly to unbreak meta-openembedded.

> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  meta-networking/recipes-support/nis/nis.inc  | 2 +-
>  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 c4aa10e..e027a1c 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 = bb.data.getVar("TARGET_OS", d, 1)
> +    os = d.getVar("TARGET_OS", True)
>      if os == "linux-uclibc":
>          raise bb.parse.SkipPackage("NIS functionality requires rpcsvc/yp.h, uClibC does not provide this")
>  }
> diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
> index 2136b07..670c94b 100644
> --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
> +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
> @@ -108,7 +108,7 @@ python populate_packages_prepend () {
>      for pkg in packages[1:]:
>          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'):
>              metapkg_rdepends.append(pkg)
> -    bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d)
> +    d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
>
>  }
>
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel