getVar/setVar cleanups

Complete the bb.data.getVar/setVar replacements with accesses
directly to the data store object.

(From OE-Core rev: 2864ff6a4b3c3f9b3bbb6d2597243cc5d3715939)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 12e0b83b94..d0cc279a66 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -437,7 +437,7 @@ python populate_packages_prepend () {
                 else:
                         rdepends = []
                 rdepends.extend(get_dependencies(file, pattern, format))
-                bb.data.setVar('RDEPENDS_' + pkg, ' '.join(rdepends), d)
+                d.setVar('RDEPENDS_' + pkg, ' '.join(rdepends))
 
         module_deps = parse_depmod()
         module_regex = '^(.*)\.k?o$'
@@ -464,10 +464,10 @@ python populate_packages_prepend () {
         for pkg in packages[1:]:
                 if not pkg in blacklist and not pkg in metapkg_rdepends:
                         metapkg_rdepends.append(pkg)
-        bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d)
+        d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
         d.setVar('DESCRIPTION_' + metapkg, 'Kernel modules meta package')
         packages.append(metapkg)
-        bb.data.setVar('PACKAGES', ' '.join(packages), d)
+        d.setVar('PACKAGES', ' '.join(packages))
 }
 
 # Support checking the kernel size since some kernels need to reside in partitions