summaryrefslogtreecommitdiffstats
path: root/meta-gnome
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
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')
-rw-r--r--meta-gnome/recipes-gnome/abiword/abiword.inc2
-rw-r--r--meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb16
-rw-r--r--meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb4
-rw-r--r--meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb8
-rw-r--r--meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb2
-rw-r--r--meta-gnome/recipes-support/goffice/goffice_0.8.17.bb2
6 files changed, 17 insertions, 17 deletions
diff --git a/meta-gnome/recipes-gnome/abiword/abiword.inc b/meta-gnome/recipes-gnome/abiword/abiword.inc
index b1b0f6701..8fbcd3bb2 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword.inc
+++ b/meta-gnome/recipes-gnome/abiword/abiword.inc
@@ -17,7 +17,7 @@ CVSURI = "cvs://anoncvs:anoncvs@anoncvs.abisource.com/cvsroot;module=abi"
17CVSSRC = "${WORKDIR}/abi" 17CVSSRC = "${WORKDIR}/abi"
18 18
19#want 2.x from 2.x.y for the installation directory 19#want 2.x from 2.x.y for the installation directory
20SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" 20SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
21 21
22FILES_${PN} += " \ 22FILES_${PN} += " \
23 ${datadir}/icons/* \ 23 ${datadir}/icons/* \
diff --git a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
index 60b970bab..c4bf3448d 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
+++ b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
@@ -21,7 +21,7 @@ SRC_URI[md5sum] = "f883b0a7f26229a9c66fd6a1a94381aa"
21SRC_URI[sha256sum] = "d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15" 21SRC_URI[sha256sum] = "d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15"
22 22
23#want 2.x from 2.x.y for the installation directory 23#want 2.x from 2.x.y for the installation directory
24SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" 24SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
25 25
26PR = "r7" 26PR = "r7"
27 27
@@ -102,21 +102,21 @@ FILES_${PN}-templates += "${datadir}/${PN}-${SHRT_VER}/templates"
102PACKAGES_DYNAMIC += "^${PN}-meta.* ^${PN}-plugin-.*" 102PACKAGES_DYNAMIC += "^${PN}-meta.* ^${PN}-plugin-.*"
103 103
104python populate_packages_prepend () { 104python populate_packages_prepend () {
105 abiword_libdir = bb.data.expand('${libdir}/abiword-2.8/plugins', d) 105 abiword_libdir = d.expand('${libdir}/abiword-2.8/plugins')
106 do_split_packages(d, abiword_libdir, '(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='') 106 do_split_packages(d, abiword_libdir, '(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
107 107
108 metapkg = "abiword-meta" 108 metapkg = "abiword-meta"
109 bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d) 109 d.setVar('ALLOW_EMPTY_' + metapkg, "1")
110 bb.data.setVar('FILES_' + metapkg, "", d) 110 d.setVar('FILES_' + metapkg, "")
111 blacklist = [ 'abiword-plugins-dbg', 'abiword-plugins', 'abiword-plugins-doc', 'abiword-plugins-dev', 'abiword-plugins-locale' ] 111 blacklist = [ 'abiword-plugins-dbg', 'abiword-plugins', 'abiword-plugins-doc', 'abiword-plugins-dev', 'abiword-plugins-locale' ]
112 metapkg_rdepends = [] 112 metapkg_rdepends = []
113 packages = bb.data.getVar('PACKAGES', d, 1).split() 113 packages = d.getVar('PACKAGES', 1).split()
114 for pkg in packages[1:]: 114 for pkg in packages[1:]:
115 if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale") and not pkg.count("abiword-doc"): 115 if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale") and not pkg.count("abiword-doc"):
116 print "Modifying ", pkg 116 print "Modifying ", pkg
117 metapkg_rdepends.append(pkg) 117 metapkg_rdepends.append(pkg)
118 bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d) 118 d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
119 bb.data.setVar('DESCRIPTION_' + metapkg, 'abiword-plugin meta package', d) 119 d.setVar('DESCRIPTION_' + metapkg, 'abiword-plugin meta package')
120 packages.append(metapkg) 120 packages.append(metapkg)
121 bb.data.setVar('PACKAGES', ' '.join(packages), d) 121 d.setVar('PACKAGES', ' '.join(packages))
122} 122}
diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
index 46be86fce..531a2d7b1 100644
--- a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
+++ b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
@@ -43,8 +43,8 @@ FILES_${PN}-doc += " ${datadir}/gtk-doc"
43PACKAGES_DYNAMIC += "^gnome-vfs-plugin-.*" 43PACKAGES_DYNAMIC += "^gnome-vfs-plugin-.*"
44 44
45python populate_packages_prepend () { 45python populate_packages_prepend () {
46 print bb.data.getVar('FILES_gnome-vfs', d, 1) 46 print d.getVar('FILES_gnome-vfs', 1)
47 47
48 plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d) 48 plugindir = d.expand('${libdir}/gnome-vfs-2.0/modules/')
49 do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s') 49 do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s')
50} 50}
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 32b54ef0c..854ba4168 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() {
diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb
index 169dac5fe..9fe531bff 100644
--- a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb
+++ b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb
@@ -3,7 +3,7 @@ SECTION = "x11/gnome/libs"
3LICENSE = "GPL-2.0" 3LICENSE = "GPL-2.0"
4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
5SRC_NAME = "ORBit2" 5SRC_NAME = "ORBit2"
6SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" 6SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
7SRC_URI = "${GNOME_MIRROR}/${SRC_NAME}/${SHRT_VER}/${SRC_NAME}-${PV}.tar.bz2 \ 7SRC_URI = "${GNOME_MIRROR}/${SRC_NAME}/${SHRT_VER}/${SRC_NAME}-${PV}.tar.bz2 \
8 file://configure-lossage.patch \ 8 file://configure-lossage.patch \
9 file://pkgconfig-fix.patch" 9 file://pkgconfig-fix.patch"
diff --git a/meta-gnome/recipes-support/goffice/goffice_0.8.17.bb b/meta-gnome/recipes-support/goffice/goffice_0.8.17.bb
index 4b6473149..c5d54ab1c 100644
--- a/meta-gnome/recipes-support/goffice/goffice_0.8.17.bb
+++ b/meta-gnome/recipes-support/goffice/goffice_0.8.17.bb
@@ -39,7 +39,7 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS}
39PACKAGES_DYNAMIC += "^goffice-plugin-.*" 39PACKAGES_DYNAMIC += "^goffice-plugin-.*"
40 40
41python populate_packages_prepend () { 41python populate_packages_prepend () {
42 goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins/', d) 42 goffice_libdir = d.expand('${libdir}/goffice/${PV}/plugins/')
43 43
44 do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) 44 do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True)
45} 45}