summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome/gtk+
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-10-28 13:49:59 +0000
committerPaul Eggleton <paul.eggleton@linux.intel.com>2012-10-28 14:32:06 +0000
commit3a30c562385cb3d9cd1b3043f6fe677a22024018 (patch)
tree66dc67f338ba316c25ca672950ef334e9e357386 /meta-gnome/recipes-gnome/gtk+
parentd66c9a8b625f7b19f7b17e728dc82413399c2e19 (diff)
downloadmeta-openembedded-3a30c562385cb3d9cd1b3043f6fe677a22024018.tar.gz
Replace bb.data.* with d.*
Used sed expression given here: http://lists.linuxtogo.org/pipermail/openembedded-core/2011-November/012373.html Plus an additional expression for .expand. Full expression is: 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' \ -e 's:bb.data.\(expand([^,]*\), \([^ )]*\) *):\2.\1):g' \ -i `grep -ril bb.data *` Some minor correction in systemd.bbclass was needed for some expressions that didn't quite match the regex in the desired way; additionally a few instances were manually changed. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta-gnome/recipes-gnome/gtk+')
-rw-r--r--meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb b/meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb
index 32b54ef0c0..854ba41686 100644
--- a/meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb
+++ b/meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb
@@ -77,17 +77,17 @@ PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*"
77python populate_packages_prepend () { 77python populate_packages_prepend () {
78 import os.path 78 import os.path
79 79
80 prologue = bb.data.getVar("postinst_prologue", d, 1) 80 prologue = d.getVar("postinst_prologue", 1)
81 81
82 gtk_libdir = bb.data.expand('${libdir}/gtk-3.0/${LIBV}', d) 82 gtk_libdir = d.expand('${libdir}/gtk-3.0/${LIBV}')
83 immodules_root = os.path.join(gtk_libdir, 'immodules') 83 immodules_root = os.path.join(gtk_libdir, 'immodules')
84 printmodules_root = os.path.join(gtk_libdir, 'printbackends'); 84 printmodules_root = os.path.join(gtk_libdir, 'printbackends');
85 85
86 do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk3-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-3.0 > /etc/gtk-3.0/gtk.immodules') 86 do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk3-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-3.0 > /etc/gtk-3.0/gtk.immodules')
87 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s') 87 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s')
88 88
89 if (bb.data.getVar('DEBIAN_NAMES', d, 1)): 89 if (d.getVar('DEBIAN_NAMES', 1)):
90 bb.data.setVar('PKG_${PN}', 'libgtk-3.0', d) 90 d.setVar('PKG_${PN}', 'libgtk-3.0')
91} 91}
92 92
93postinst_prologue() { 93postinst_prologue() {