diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-09 15:00:01 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-10 11:35:32 +0000 |
commit | b22831fd63164c4db9c0b72934d7d734a6585251 (patch) | |
tree | edb6581a041190290855bf86714430515c9f235a /meta/recipes-qt/qt4 | |
parent | 07ded02ffd37b4fe60a6210dbf56490ea306f0b6 (diff) | |
download | openembedded-core-b22831fd63164c4db9c0b72934d7d734a6585251.tar.gz openembedded-core-b22831fd63164c4db9c0b72934d7d734a6585251.tar.bz2 openembedded-core-b22831fd63164c4db9c0b72934d7d734a6585251.tar.xz openembedded-core-b22831fd63164c4db9c0b72934d7d734a6585251.zip |
Convert to use direct access to the data store (instead of bb.data.*Var*())
This is the result of running the following over the metadata:
sed \
-e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \
-e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-i `grep -ril bb.data *`
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4')
-rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 20 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4_arch.inc | 6 |
2 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 1406a874e..82ba6377a 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -39,8 +39,8 @@ python __anonymous () { lib_packages = [] dev_packages = [] dbg_packages = [] - for name in bb.data.getVar("QT_LIB_NAMES", d, 1).split(): - pkg = bb.data.getVar("QT_BASE_LIB",d, True) + name.lower().replace("qt", "").replace("_", "-") + "4" + for name in d.getVar("QT_LIB_NAMES", 1).split(): + 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) @@ -51,15 +51,15 @@ python __anonymous () { ${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) - bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg", d) + d.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg") lib_packages.append(pkg) dev_packages.append("%s-dev" % pkg) dbg_packages.append("%s-dbg" % pkg) - for name in bb.data.getVar("OTHER_PACKAGES", d, 1).split(): + for name in d.getVar("OTHER_PACKAGES", 1).split(): dbg_packages.append("%s-dbg" % name) - for name in bb.data.getVar("QT_EXTRA_LIBS", d, 1).split(): - pkg = bb.data.getVar("QT_BASE_LIB",d, True) + name.lower().replace("qt", "").replace("_", "-") + "4" + 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 ${libdir}/lib%(name)s.a @@ -68,7 +68,7 @@ python __anonymous () { ${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) - bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg", d) + d.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg") lib_packages.append(pkg) dev_packages.append("%s-dev" % pkg) dbg_packages.append("%s-dbg" % pkg) @@ -256,14 +256,14 @@ python populate_packages_prepend() { do_split_packages(d, plugin_dir, glob, plugin_name, '${PN} %s for %%s' % name, extra_depends='', hook=dev_hook) # Create a -dbg package as well plugin_dir_dbg = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug' % path, d) - packages = bb.data.getVar('PACKAGES',d) + packages = d.getVar('PACKAGES') for (file,package) in dev_packages: packages = "%s %s-dbg" % (packages, package) file_name = os.path.join(plugin_dir_dbg, os.path.basename(file)) - bb.data.setVar("FILES_%s-dbg" % package, file_name, d) + d.setVar("FILES_%s-dbg" % package, file_name) bb.data.setVar("DESCRIPTION_%s-dbg" % package, "${PN} %s for %s" % (name, package), d) - bb.data.setVar('PACKAGES', packages, d) + d.setVar('PACKAGES', packages) qtopia_split('accessible', 'accessible', '^libq(.*)\.so$') qtopia_split('codecs', 'codec', '^libq(.*)\.so$') diff --git a/meta/recipes-qt/qt4/qt4_arch.inc b/meta/recipes-qt/qt4/qt4_arch.inc index e8c8fabe6..46d65a20d 100644 --- a/meta/recipes-qt/qt4/qt4_arch.inc +++ b/meta/recipes-qt/qt4/qt4_arch.inc @@ -4,7 +4,7 @@ ARM_INSTRUCTION_SET = "arm" def qt_arch(d): import bb, re - arch = bb.data.getVar('TARGET_ARCH', d, 1) + arch = d.getVar('TARGET_ARCH', 1) if re.match("^i.86$", arch): arch = "i386" elif re.match("^arm.*", arch): @@ -17,9 +17,9 @@ def qt_arch(d): def qt_endian(d): import bb - if bb.data.getVar('SITEINFO_ENDIANNESS', d, True) == "le": + if d.getVar('SITEINFO_ENDIANNESS', True) == "le": return "-little-endian" - elif bb.data.getVar('SITEINFO_ENDIANNESS', d, True) == "be": + elif d.getVar('SITEINFO_ENDIANNESS', True) == "be": return "-big-endian" else: assert False |