From 7aaa67a61b816c8c979a0fe5450493823faab7fc Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 6 Jul 2013 10:12:39 -0300 Subject: [PATCH] gpu-viv-bin-mx6q.inc: Keep library package suffix for OpenGL interfaces For the packages that make up the OpenGL interfaces, inject variables so that they don't get Debian-renamed (which would remove the -mx6 suffix). Change-Id: I203addf85c08a6f0c7cddaa6bfa45f6b896bf595 Signed-off-by: Otavio Salvador --- .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc index 33548546..85ba283b 100644 --- a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc +++ b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc @@ -50,12 +50,33 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1" REALSOLIBS := "${SOLIBS}" SOLIBS = "${SOLIBSDEV}" +# For the packages that make up the OpenGL interfaces, inject variables so that +# they don't get Debian-renamed (which would remove the -mx6 suffix). +# # FIXME: All binaries lack GNU_HASH in elf binary but as we don't have # the source we cannot fix it. Disable the insane check for now. python __anonymous() { packages = d.getVar('PACKAGES', True).split() for p in packages: d.appendVar("INSANE_SKIP_%s" % p, " ldflags") + + for p in (("libegl", "libegl1"), ("libgl", "libgl1"), + ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"), + ("libgles3",)): + fullp = p[0] + "-mx6" + pkgs = " ".join(p) + d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") + d.appendVar("RREPLACES_" + fullp, pkgs) + d.appendVar("RPROVIDES_" + fullp, pkgs) + d.appendVar("RCONFLICTS_" + fullp, pkgs) + + # For -dev, the first element is both the Debian and original name + fullp += "-dev" + pkgs = p[0] + "-dev" + d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") + d.appendVar("RREPLACES_" + fullp, pkgs) + d.appendVar("RPROVIDES_" + fullp, pkgs) + d.appendVar("RCONFLICTS_" + fullp, pkgs) } do_install () { -- 2.40.1