summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2020-10-23 11:17:49 -0700
committerOtavio Salvador <otavio@ossystems.com.br>2021-01-13 01:08:21 -0300
commit377e223a7ba900fe51fae588f84891aecc09347f (patch)
tree706afc3e3db61c4da614ddef16e6003f9abe51de
parent7acedfd1081705228290ca04c98553f616e3b6df (diff)
downloadmeta-freescale-377e223a7ba900fe51fae588f84891aecc09347f.tar.gz
imx-gpu-viv: Fix rootfs conflict with libvulkan-dev
The rootfs stage is failing with the following error: ``` Some packages could not be installed. This may mean that you have requested an impossible situation or if you are using the unstable distribution that some required packages have not yet been created or been moved out of Incoming. The following information may help to resolve the situation: The following packages have unmet dependencies: libvulkan-imx-dev : Conflicts: libvulkan-dev Recommends: libglslc-imx-dev but it is not installable Recommends: libvsc-imx-dev but it is not installable E: Unable to correct problems, you have held broken packages. ``` It seems this is a result of disabling debian renaming. This was originally added in an NXP layer due to a conflict with a vulkan recipe that is no longer being used. Restoring the overrides for libvulkan-imx to the default state fixes the build break. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index 43a82a48..9eeea103 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -121,7 +121,7 @@ python __anonymous() {
121 # they don't get Debian-renamed (which would remove the -imx suffix). 121 # they don't get Debian-renamed (which would remove the -imx suffix).
122 for p in (("libegl", "libegl1"), ("libgl", "libgl1"), 122 for p in (("libegl", "libegl1"), ("libgl", "libgl1"),
123 ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"), 123 ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"),
124 ("libgles3",) , ("libvulkan",), ("libgbm",)): 124 ("libgles3",), ("libgbm",)):
125 fullp = p[0] + "-imx" 125 fullp = p[0] + "-imx"
126 pkgs = "".join(' %s' % i for i in p) 126 pkgs = "".join(' %s' % i for i in p)
127 d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") 127 d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")