From f02e0ae803b7a37b410c8487916331cdcae98cf3 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Fri, 20 Jun 2014 18:28:01 +0800 Subject: 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. Signed-off-by: Ming Liu Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa.inc | 6 +++--- 1 file 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() { python mesa_populate_packages() { pkgs = ['mesa', 'mesa-dev', 'mesa-dbg'] for pkg in pkgs: - d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-")) - d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa-", "mesa-dri-")) - d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-")) + d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) + d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) + d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) import re dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri") -- cgit v1.2.3