summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-03 11:21:22 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-05 18:23:53 (GMT)
commitb1aeaa8b0dcf27ef8dcd87279901c6f5817d9e94 (patch)
tree62b315fdc05e03677922a0161fdc7a39e2985466 /meta/recipes-qt
parent22f0df2aa737bda1ae3bce862ee5ceba5b2d204b (diff)
downloadpoky-b1aeaa8b0dcf27ef8dcd87279901c6f5817d9e94.tar.gz
meta: Replace bb.data.expand(xxx, d) -> d.expand(xxx)
sed \ -e 's:bb.data.\(expand([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data.expand *` Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt-apps/qmmp_0.5.2.bb4
-rw-r--r--meta/recipes-qt/qt4/qt4.inc22
2 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
index 469351c..df18f91 100644
--- a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
+++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
@@ -31,8 +31,8 @@ PACKAGES_DYNAMIC = "qmmp-plugin-* "
31 31
32python populate_packages_prepend () { 32python populate_packages_prepend () {
33 import os 33 import os
34 qmmp_libdir = bb.data.expand('${libdir}/qmmp', d) 34 qmmp_libdir = d.expand('${libdir}/qmmp')
35 gd = bb.data.expand('${D}/${libdir}/qmmp', d) 35 gd = d.expand('${D}/${libdir}/qmmp')
36 plug_dirs = os.listdir(gd) 36 plug_dirs = os.listdir(gd)
37 37
38 for plug_dir in plug_dirs: 38 for plug_dir in plug_dirs:
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 4d71913..2e70bd9 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -257,17 +257,17 @@ do_compile() {
257} 257}
258 258
259python populate_packages_prepend() { 259python populate_packages_prepend() {
260 translation_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d) 260 translation_dir = d.expand('${datadir}/${QT_DIR_NAME}/translations/')
261 translation_name = bb.data.expand('${QT_BASE_NAME}-translation-%s', d) 261 translation_name = d.expand('${QT_BASE_NAME}-translation-%s')
262 do_split_packages(d, translation_dir, '^(assistant|designer|linguist|qt|qtconfig|qvfb)_(.*)\.qm$', translation_name, '${PN} translation for %s', extra_depends='' ) 262 do_split_packages(d, translation_dir, '^(assistant|designer|linguist|qt|qtconfig|qvfb)_(.*)\.qm$', translation_name, '${PN} translation for %s', extra_depends='' )
263 263
264 phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d) 264 phrasebook_dir = d.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/')
265 phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d) 265 phrasebook_name = d.expand('${QT_BASE_NAME}-phrasebook-%s')
266 import os; 266 import os;
267 if os.path.exists("%s%s" % (bb.data.expand('${D}',d), phrasebook_dir)): 267 if os.path.exists("%s%s" % (d.expand('${D}'), phrasebook_dir)):
268 do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' ) 268 do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
269 else: 269 else:
270 bb.note("The path does not exist:", bb.data.expand('${D}', d), phrasebook_dir) 270 bb.note("The path does not exist:", d.expand('${D}'), phrasebook_dir)
271 271
272 # Package all the plugins and their -dbg version and create a meta package 272 # Package all the plugins and their -dbg version and create a meta package
273 def qtopia_split(path, name, glob): 273 def qtopia_split(path, name, glob):
@@ -275,17 +275,17 @@ python populate_packages_prepend() {
275 Split the package into a normal and -dbg package and then add the 275 Split the package into a normal and -dbg package and then add the
276 new packages to the meta package. 276 new packages to the meta package.
277 """ 277 """
278 plugin_dir = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/' % path, d) 278 plugin_dir = d.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/' % path)
279 if not os.path.exists("%s%s" % (bb.data.expand('${D}',d), plugin_dir)): 279 if not os.path.exists("%s%s" % (d.expand('${D}'), plugin_dir)):
280 bb.note("The path does not exist:", bb.data.expand('${D}', d), plugin_dir) 280 bb.note("The path does not exist:", d.expand('${D}'), plugin_dir)
281 return 281 return
282 282
283 plugin_name = bb.data.expand('${QT_BASE_NAME}-plugin-%s-%%s' % name, d) 283 plugin_name = d.expand('${QT_BASE_NAME}-plugin-%s-%%s' % name)
284 dev_packages = [] 284 dev_packages = []
285 dev_hook = lambda file,pkg,b,c,d:dev_packages.append((file,pkg)) 285 dev_hook = lambda file,pkg,b,c,d:dev_packages.append((file,pkg))
286 do_split_packages(d, plugin_dir, glob, plugin_name, '${PN} %s for %%s' % name, extra_depends='', hook=dev_hook) 286 do_split_packages(d, plugin_dir, glob, plugin_name, '${PN} %s for %%s' % name, extra_depends='', hook=dev_hook)
287 # Create a -dbg package as well 287 # Create a -dbg package as well
288 plugin_dir_dbg = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug' % path, d) 288 plugin_dir_dbg = d.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug' % path)
289 packages = d.getVar('PACKAGES') 289 packages = d.getVar('PACKAGES')
290 for (file,package) in dev_packages: 290 for (file,package) in dev_packages:
291 packages = "%s %s-dbg" % (packages, package) 291 packages = "%s %s-dbg" % (packages, package)