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-graphics/mesa | |
| 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-graphics/mesa')
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 1f9fbcab7d..5d882b1001 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
| @@ -114,7 +114,7 @@ do_install_append () { | |||
| 114 | # they don't get Debian-renamed (which would remove the -mesa suffix), and | 114 | # they don't get Debian-renamed (which would remove the -mesa suffix), and |
| 115 | # RPROVIDEs/RCONFLICTs on the generic libgl name. | 115 | # RPROVIDEs/RCONFLICTs on the generic libgl name. |
| 116 | python __anonymous() { | 116 | python __anonymous() { |
| 117 | pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split() | 117 | pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() |
| 118 | for p in (("egl", "libegl", "libegl1"), | 118 | for p in (("egl", "libegl", "libegl1"), |
| 119 | ("dri", "libgl", "libgl1"), | 119 | ("dri", "libgl", "libgl1"), |
| 120 | ("gles", "libgles1", "libglesv1-cm1"), | 120 | ("gles", "libgles1", "libglesv1-cm1"), |
| @@ -148,7 +148,7 @@ python mesa_populate_packages() { | |||
| 148 | d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) | 148 | d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) |
| 149 | 149 | ||
| 150 | import re | 150 | import re |
| 151 | dri_drivers_root = oe.path.join(d.getVar('PKGD', True), d.getVar('libdir', True), "dri") | 151 | dri_drivers_root = oe.path.join(d.getVar('PKGD'), d.getVar('libdir'), "dri") |
| 152 | if os.path.isdir(dri_drivers_root): | 152 | if os.path.isdir(dri_drivers_root): |
| 153 | dri_pkgs = os.listdir(dri_drivers_root) | 153 | dri_pkgs = os.listdir(dri_drivers_root) |
| 154 | lib_name = d.expand("${MLPREFIX}mesa-megadriver") | 154 | lib_name = d.expand("${MLPREFIX}mesa-megadriver") |
| @@ -160,7 +160,7 @@ python mesa_populate_packages() { | |||
| 160 | d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name) | 160 | d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name) |
| 161 | d.appendVar("RREPLACES_%s" % lib_name, pkg_name) | 161 | d.appendVar("RREPLACES_%s" % lib_name, pkg_name) |
| 162 | 162 | ||
| 163 | pipe_drivers_root = os.path.join(d.getVar('libdir', True), "gallium-pipe") | 163 | pipe_drivers_root = os.path.join(d.getVar('libdir'), "gallium-pipe") |
| 164 | do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='') | 164 | do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='') |
| 165 | } | 165 | } |
| 166 | 166 | ||
