summaryrefslogtreecommitdiff
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-25 14:25:16 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-26 22:42:00 +0000
commit2864ff6a4b3c3f9b3bbb6d2597243cc5d3715939 (patch)
treed19082aee83252afd998f387e4aeac78b9108c34 /meta/recipes-qt
parent54c4b4fd10c104641bb7ae087b2230aa6c6085f8 (diff)
downloadopenembedded-core-2864ff6a4b3c3f9b3bbb6d2597243cc5d3715939.tar.gz
openembedded-core-2864ff6a4b3c3f9b3bbb6d2597243cc5d3715939.tar.bz2
openembedded-core-2864ff6a4b3c3f9b3bbb6d2597243cc5d3715939.tar.xz
openembedded-core-2864ff6a4b3c3f9b3bbb6d2597243cc5d3715939.zip
getVar/setVar cleanups
Complete the bb.data.getVar/setVar replacements with accesses directly to the data store object. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4.inc24
1 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 82ba6377a..4dc9a75e5 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -43,14 +43,14 @@ python __anonymous () {
pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4"
# NOTE: the headers for QtAssistantClient are different
incname = name.replace("QtAssistantClient", "QtAssistant")
- bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d)
- bb.data.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s${QT_LIBINFIX}.prl
+ d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals())
+ d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s${QT_LIBINFIX}.prl
${libdir}/lib%(name)s${QT_LIBINFIX}.a
${libdir}/lib%(name)s${QT_LIBINFIX}.la
${libdir}/lib%(name)s${QT_LIBINFIX}.so
${includedir}/${QT_DIR_NAME}/%(incname)s
- ${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals(), d)
- bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so*" % locals(), d)
+ ${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals())
+ d.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so*" % locals())
d.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg")
lib_packages.append(pkg)
dev_packages.append("%s-dev" % pkg)
@@ -60,22 +60,22 @@ python __anonymous () {
for name in d.getVar("QT_EXTRA_LIBS", 1).split():
pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4"
- bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals(), d)
- bb.data.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl
+ d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals())
+ d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl
${libdir}/lib%(name)s.a
${libdir}/lib%(name)s.la
${libdir}/lib%(name)s.so
${includedir}/${QT_DIR_NAME}/%(incname)s
- ${libdir}/pkgconfig/%(name)s.pc""" % locals(), d)
- bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s.so*" % locals(), d)
+ ${libdir}/pkgconfig/%(name)s.pc""" % locals())
+ d.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s.so*" % locals())
d.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg")
lib_packages.append(pkg)
dev_packages.append("%s-dev" % pkg)
dbg_packages.append("%s-dbg" % pkg)
- bb.data.setVar("LIB_PACKAGES", " ".join(lib_packages), d)
- bb.data.setVar("DEV_PACKAGES", " ".join(dev_packages), d)
- bb.data.setVar("DBG_PACKAGES", " ".join(dbg_packages), d)
+ d.setVar("LIB_PACKAGES", " ".join(lib_packages))
+ d.setVar("DEV_PACKAGES", " ".join(dev_packages))
+ d.setVar("DBG_PACKAGES", " ".join(dbg_packages))
}
OTHER_PACKAGES = "\
@@ -261,7 +261,7 @@ python populate_packages_prepend() {
packages = "%s %s-dbg" % (packages, package)
file_name = os.path.join(plugin_dir_dbg, os.path.basename(file))
d.setVar("FILES_%s-dbg" % package, file_name)
- bb.data.setVar("DESCRIPTION_%s-dbg" % package, "${PN} %s for %s" % (name, package), d)
+ d.setVar("DESCRIPTION_%s-dbg" % package, "${PN} %s for %s" % (name, package))
d.setVar('PACKAGES', packages)