summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/mesa')
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc21
1 files changed, 11 insertions, 10 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index a4e53516f3..1d084c0b85 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -142,16 +142,17 @@ python mesa_populate_packages() {
142 d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) 142 d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1))
143 143
144 import re 144 import re
145 dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri") 145 dri_drivers_root = oe.path.join(d.getVar('PKGD', True), d.getVar('libdir', True), "dri")
146 dri_pkgs = os.listdir(d.getVar('PKGD', True) + dri_drivers_root) 146 if os.path.isdir(dri_drivers_root):
147 lib_name = d.expand("${MLPREFIX}mesa-megadriver") 147 dri_pkgs = os.listdir(dri_drivers_root)
148 for p in dri_pkgs: 148 lib_name = d.expand("${MLPREFIX}mesa-megadriver")
149 m = re.match('^(.*)_dri\.so$', p) 149 for p in dri_pkgs:
150 if m: 150 m = re.match('^(.*)_dri\.so$', p)
151 pkg_name = " ${MLPREFIX}mesa-driver-%s" % legitimize_package_name(m.group(1)) 151 if m:
152 d.appendVar("RPROVIDES_%s" % lib_name, pkg_name) 152 pkg_name = " ${MLPREFIX}mesa-driver-%s" % legitimize_package_name(m.group(1))
153 d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name) 153 d.appendVar("RPROVIDES_%s" % lib_name, pkg_name)
154 d.appendVar("RREPLACES_%s" % lib_name, pkg_name) 154 d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name)
155 d.appendVar("RREPLACES_%s" % lib_name, pkg_name)
155 156
156 pipe_drivers_root = os.path.join(d.getVar('libdir', True), "gallium-pipe") 157 pipe_drivers_root = os.path.join(d.getVar('libdir', True), "gallium-pipe")
157 do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='') 158 do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='')