Skip to contentSkip to conversation

nis/opencv: Update getVar/setVar syntax

PATCH In review Richard Purdie 2 participants 2 messages Nov 23, 2016 – Nov 24, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nis/opencv: Update getVar/setVar syntax

The deprecated APIs are removed from bitbake, update two old style references in meta-oe/meta-networking.

---
 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(-)
meta-networking/recipes-support/nis/nis.inc +1 -1
index c4aa10e..e027a1c 100644
@@ -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")
 }
meta-oe/recipes-support/opencv/opencv_3.1.bb +1 -1
index 2136b07..670c94b 100644
@@ -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))
 
 }
 
Signature · 1 line
2.7.4
#1 lore raw
Quoted 3 lines · Richard Purdie

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.

Quoted 40 lines
---
 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(-)
meta-networking/recipes-support/nis/nis.inc +1 -1
index c4aa10e..e027a1c 100644
@@ -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")
 }
meta-oe/recipes-support/opencv/opencv_3.1.bb +1 -2
index 2136b07..670c94b 100644
@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel