diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-03 10:59:25 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-05 10:22:56 -0800 |
commit | 06f2f8ce0a3093973ca54b48f542f8485b666079 (patch) | |
tree | dbcfa5c491eb2e5d237aa539cb7c6e77dc07dd6f /meta/recipes-graphics | |
parent | d01dadfb87cfd2284b3e849d35a35fe5df0239c4 (diff) | |
download | poky-06f2f8ce0a3093973ca54b48f542f8485b666079.tar.gz |
meta: Convert getVar/getVarFlag(xxx, 1) -> (xxx, True)
Using "1" with getVar is bad coding style and "True" is preferred.
This patch is a sed over the meta directory of the form:
sed \
-e 's:\(\.getVar([^,()]*, \)1 *):\1True):g' \
-e 's:\(\.getVarFlag([^,()]*, [^,()]*, \)1 *):\1True):g' \
-i `grep -ril getVar *`
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r-- | meta/recipes-graphics/cairo/cairo-fpu.inc | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/clutter/clutter-fpu.inc | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-dri.inc | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/pango/pango.inc | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-graphics/cairo/cairo-fpu.inc b/meta/recipes-graphics/cairo/cairo-fpu.inc index 8c0ecfde94..bf5a1b01e1 100644 --- a/meta/recipes-graphics/cairo/cairo-fpu.inc +++ b/meta/recipes-graphics/cairo/cairo-fpu.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | 1 | ||
2 | def get_cairo_fpu_setting(bb, d): | 2 | def get_cairo_fpu_setting(bb, d): |
3 | if d.getVar('TARGET_FPU', 1) in [ 'soft' ]: | 3 | if d.getVar('TARGET_FPU', True) in [ 'soft' ]: |
4 | return "--disable-some-floating-point" | 4 | return "--disable-some-floating-point" |
5 | return "" | 5 | return "" |
6 | 6 | ||
diff --git a/meta/recipes-graphics/clutter/clutter-fpu.inc b/meta/recipes-graphics/clutter/clutter-fpu.inc index dfa933de5c..7b5dc68e3c 100644 --- a/meta/recipes-graphics/clutter/clutter-fpu.inc +++ b/meta/recipes-graphics/clutter/clutter-fpu.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | 1 | ||
2 | def get_clutter_fpu_setting(bb, d): | 2 | def get_clutter_fpu_setting(bb, d): |
3 | if d.getVar('TARGET_FPU', 1) in [ 'soft' ]: | 3 | if d.getVar('TARGET_FPU', True) in [ 'soft' ]: |
4 | return "--without-fpu" | 4 | return "--without-fpu" |
5 | return "" | 5 | return "" |
6 | 6 | ||
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb b/meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb index 0e213909e3..a2fd409c42 100644 --- a/meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb +++ b/meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb | |||
@@ -3,7 +3,7 @@ inherit native | |||
3 | DEPENDS = "freetype-native expat-native zlib-native" | 3 | DEPENDS = "freetype-native expat-native zlib-native" |
4 | 4 | ||
5 | EXTRA_OEMAKE = "" | 5 | EXTRA_OEMAKE = "" |
6 | EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % d.getVar('STAGING_BINDIR', 1)][os.path.isfile('%s/freetype-config' % d.getVar('STAGING_BINDIR', 1))]}" | 6 | EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % d.getVar('STAGING_BINDIR', True)][os.path.isfile('%s/freetype-config' % d.getVar('STAGING_BINDIR', True))]}" |
7 | 7 | ||
8 | do_install_append () { | 8 | do_install_append () { |
9 | install -d ${D}${bindir}/ | 9 | install -d ${D}${bindir}/ |
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc index 3687648999..480672fd08 100644 --- a/meta/recipes-graphics/mesa/mesa-dri.inc +++ b/meta/recipes-graphics/mesa/mesa-dri.inc | |||
@@ -13,7 +13,7 @@ EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gal | |||
13 | python populate_packages_prepend() { | 13 | python populate_packages_prepend() { |
14 | import os.path | 14 | import os.path |
15 | 15 | ||
16 | dri_drivers_root = os.path.join(d.getVar('libdir', 1), "dri") | 16 | dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri") |
17 | 17 | ||
18 | do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='') | 18 | do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='') |
19 | } | 19 | } |
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index 516153c3df..8b36d04c03 100644 --- a/meta/recipes-graphics/pango/pango.inc +++ b/meta/recipes-graphics/pango/pango.inc | |||
@@ -50,7 +50,7 @@ fi | |||
50 | } | 50 | } |
51 | 51 | ||
52 | python populate_packages_prepend () { | 52 | python populate_packages_prepend () { |
53 | prologue = d.getVar("postinst_prologue", 1) | 53 | prologue = d.getVar("postinst_prologue", True) |
54 | 54 | ||
55 | modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d) | 55 | modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d) |
56 | 56 | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb b/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb index 498700a204..1166e57ff3 100644 --- a/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb +++ b/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb | |||
@@ -26,7 +26,7 @@ XORG_PN = "libXft" | |||
26 | BBCLASSEXTEND = "native" | 26 | BBCLASSEXTEND = "native" |
27 | 27 | ||
28 | python () { | 28 | python () { |
29 | if d.getVar('DEBIAN_NAMES', 1): | 29 | if d.getVar('DEBIAN_NAMES', True): |
30 | d.setVar('PKG_${PN}', '${MLPREFIX}libxft2') | 30 | d.setVar('PKG_${PN}', '${MLPREFIX}libxft2') |
31 | } | 31 | } |
32 | 32 | ||