From c4e2c59088765d1f1de7ec57cde91980f887c2ff Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 14 Dec 2016 21:13:04 +0000 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.0.bb | 2 +- .../recipes-gnome/gobject-introspection/gobject-introspection_1.50.0.bb | 2 +- meta/recipes-gnome/gtk+/gtk+3.inc | 2 +- meta/recipes-gnome/gtk+/gtk+_2.24.31.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/recipes-gnome') 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-.*" PACKAGES_DYNAMIC_class-native = "" python populate_packages_prepend () { - postinst_pixbufloader = d.getVar("postinst_pixbufloader", True) + postinst_pixbufloader = d.getVar("postinst_pixbufloader") loaders_root = d.expand('${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders') 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 () { SSTATEPOSTINSTFUNCS += "gobject_introspection_postinst" python gobject_introspection_postinst () { - if d.getVar("BB_CURRENTTASK", True).startswith("populate_sysroot"): + if d.getVar("BB_CURRENTTASK").startswith("populate_sysroot"): oe.utils.write_ld_so_conf(d) } 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 () { do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s') - if (d.getVar('DEBIAN_NAMES', True)): + if (d.getVar('DEBIAN_NAMES')): d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-3.0') } 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 () { d.setVar('GTKIMMODULES_PACKAGES', ' '.join(do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s'))) do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') - if (d.getVar('DEBIAN_NAMES', True)): + if (d.getVar('DEBIAN_NAMES')): d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-2.0') } -- cgit 1.2.3-korg