diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/recipes-gnome | |
parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz |
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
4 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.0.bb index a5ebecaff3..9efe374c0d 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.0.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.0.bb | |||
@@ -59,7 +59,7 @@ PACKAGES_DYNAMIC += "^gdk-pixbuf-loader-.*" | |||
59 | PACKAGES_DYNAMIC_class-native = "" | 59 | PACKAGES_DYNAMIC_class-native = "" |
60 | 60 | ||
61 | python populate_packages_prepend () { | 61 | python populate_packages_prepend () { |
62 | postinst_pixbufloader = d.getVar("postinst_pixbufloader", True) | 62 | postinst_pixbufloader = d.getVar("postinst_pixbufloader") |
63 | 63 | ||
64 | loaders_root = d.expand('${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders') | 64 | loaders_root = d.expand('${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders') |
65 | 65 | ||
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.50.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.50.0.bb index b6d296aa09..0c29a3b377 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.50.0.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.50.0.bb | |||
@@ -168,6 +168,6 @@ python gobject_introspection_preconfigure () { | |||
168 | 168 | ||
169 | SSTATEPOSTINSTFUNCS += "gobject_introspection_postinst" | 169 | SSTATEPOSTINSTFUNCS += "gobject_introspection_postinst" |
170 | python gobject_introspection_postinst () { | 170 | python gobject_introspection_postinst () { |
171 | if d.getVar("BB_CURRENTTASK", True).startswith("populate_sysroot"): | 171 | if d.getVar("BB_CURRENTTASK").startswith("populate_sysroot"): |
172 | oe.utils.write_ld_so_conf(d) | 172 | oe.utils.write_ld_so_conf(d) |
173 | } | 173 | } |
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index 745c6fa5de..6499ea6c8d 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc | |||
@@ -125,6 +125,6 @@ python populate_packages_prepend () { | |||
125 | 125 | ||
126 | do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s') | 126 | do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s') |
127 | 127 | ||
128 | if (d.getVar('DEBIAN_NAMES', True)): | 128 | if (d.getVar('DEBIAN_NAMES')): |
129 | d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-3.0') | 129 | d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-3.0') |
130 | } | 130 | } |
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.31.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.31.bb index 84d0b4d980..cc31bab6d1 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.24.31.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.24.31.bb | |||
@@ -29,6 +29,6 @@ python populate_packages_prepend () { | |||
29 | d.setVar('GTKIMMODULES_PACKAGES', ' '.join(do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s'))) | 29 | d.setVar('GTKIMMODULES_PACKAGES', ' '.join(do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s'))) |
30 | do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') | 30 | do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') |
31 | 31 | ||
32 | if (d.getVar('DEBIAN_NAMES', True)): | 32 | if (d.getVar('DEBIAN_NAMES')): |
33 | d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-2.0') | 33 | d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-2.0') |
34 | } | 34 | } |