summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa
diff options
context:
space:
mode:
authorMing Liu <ming.liu@windriver.com>2014-06-20 18:28:01 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-24 19:54:11 +0100
commitb2aa82c4823900582a0a4b784c85e91515cc79fe (patch)
tree3c301373fd98b062410b5e1754c603535974fcc2 /meta/recipes-graphics/mesa
parentf197918c39bf8b8156e28f444bcffa1cb2268f5a (diff)
downloadpoky-b2aa82c4823900582a0a4b784c85e91515cc79fe.tar.gz
mesa.inc: remove '-' suffix in substitution of package names
The current substitution to package names is not correct, its original purpose is: replace "mesa-" with "mesa-dri-", in which process the "mesa" package is left out, this leads mesa package to announce to conflict with itself, and therefore cause build failures when multilib mesa are being added to rootfs. Changing the replacement pattern to without a '-' suffix will fix it. (From OE-Core rev: f02e0ae803b7a37b410c8487916331cdcae98cf3) Signed-off-by: Ming Liu <ming.liu@windriver.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.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 453510ad12..3298e00ebe 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -132,9 +132,9 @@ python __anonymous() {
132python mesa_populate_packages() { 132python mesa_populate_packages() {
133 pkgs = ['mesa', 'mesa-dev', 'mesa-dbg'] 133 pkgs = ['mesa', 'mesa-dev', 'mesa-dbg']
134 for pkg in pkgs: 134 for pkg in pkgs:
135 d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-")) 135 d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1))
136 d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa-", "mesa-dri-")) 136 d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1))
137 d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-")) 137 d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1))
138 138
139 import re 139 import re
140 dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri") 140 dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")