Patchwork [2/2] mesa.inc: remove '-' suffix in substitution of package names

login
register
mail settings
Submitter Ming Liu
Date June 20, 2014, 10:28 a.m.
Message ID <1403260081-669-2-git-send-email-ming.liu@windriver.com>
Download mbox | patch
Permalink /patch/74163/
State New
Headers show

Comments

Ming Liu - June 20, 2014, 10:28 a.m.
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 <ming.liu@windriver.com>
---
 meta/recipes-graphics/mesa/mesa.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index ad3b741..0cf7985 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -134,9 +134,9 @@  python mesa_populate_packages() {
     ml = d.getVar('MLPREFIX', True)
     pkgs = [ml + 'mesa', ml + 'mesa-dev', ml + '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")