summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/mesa.inc
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-15 16:25:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-27 10:47:05 +0100
commitedbf8d3999126e3c271a47dada54d1724f59f573 (patch)
tree98f7ca63aba6fa135555406454a7d4fcb78f4159 /meta/recipes-graphics/mesa/mesa.inc
parent706b623c12f4576805e999ece91acf89ea22e5ef (diff)
downloadpoky-edbf8d3999126e3c271a47dada54d1724f59f573.tar.gz
multilib/recipes: Use new RecipePostKeyExpansion event
There are issues with multilib due to the ordering of events where some functions see the remapped multilib dependencies and some do not. A significant problem is that the multilib class needs to make some changes before key expansion and some afterwards but by using existing event handlers, some code sees things in a partially translated state, leading to bugs. This patch changes things to use a new event handler from bitbake which makes the ordering of the changes explcit. The challenge in doing this is that it breaks some existing anonymous python and dyanmic assignments. In some cases these used to be translated and no longer are, meaning MLPREFIX has to be added. In some cases these are now translated and the MLPREFIX can be removed. This change does now make it very clear when MLPREFIX is required and when it is not, its just the migration path which is harder. The patch changes the small number of cases where fixes are needed. In particular, where a variable like RDEPENDS is conditionally extended (e.g. with an override), MLPREFIX is now required. This patch also reverts: base: Revert 'base.bbclass: considering multilib when setting LICENSE_EXCLUSION' This reverts 6597130256a1609c3e05ec5891aceaf549c37985 as the changes to multilib datastore handling mean its no longer necessary. (From OE-Core rev: b3fda056a674889cd9697e779de023d4f993d3ce) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa.inc')
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc10
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index fede691d6f..bb43a9a8b6 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -212,18 +212,20 @@ python __anonymous() {
212 ("gles", "libgles3",)): 212 ("gles", "libgles3",)):
213 if not p[0] in pkgconfig: 213 if not p[0] in pkgconfig:
214 continue 214 continue
215 fullp = p[1] + "-mesa" 215 mlprefix = d.getVar("MLPREFIX")
216 pkgs = " ".join(p[1:]) 216 fullp = mlprefix + p[1] + "-mesa"
217 mlprefix = d.getVar("MLPREFIX")
218 pkgs = " ".join(mlprefix + x for x in p[1:])
217 d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") 219 d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
218 d.appendVar("RREPLACES_" + fullp, pkgs) 220 d.appendVar("RREPLACES_" + fullp, pkgs)
219 d.appendVar("RPROVIDES_" + fullp, pkgs) 221 d.appendVar("RPROVIDES_" + fullp, pkgs)
220 d.appendVar("RCONFLICTS_" + fullp, pkgs) 222 d.appendVar("RCONFLICTS_" + fullp, pkgs)
221 223
222 d.appendVar("RRECOMMENDS_" + fullp, " mesa-megadriver") 224 d.appendVar("RRECOMMENDS_" + fullp, " ${MLPREFIX}mesa-megadriver")
223 225
224 # For -dev, the first element is both the Debian and original name 226 # For -dev, the first element is both the Debian and original name
225 fullp += "-dev" 227 fullp += "-dev"
226 pkgs = p[1] + "-dev" 228 pkgs = mlprefix + p[1] + "-dev"
227 d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") 229 d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
228 d.appendVar("RREPLACES_" + fullp, pkgs) 230 d.appendVar("RREPLACES_" + fullp, pkgs)
229 d.appendVar("RPROVIDES_" + fullp, pkgs) 231 d.appendVar("RPROVIDES_" + fullp, pkgs)