From 377e223a7ba900fe51fae588f84891aecc09347f Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 23 Oct 2020 11:17:49 -0700 Subject: 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 --- recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() { # they don't get Debian-renamed (which would remove the -imx suffix). for p in (("libegl", "libegl1"), ("libgl", "libgl1"), ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"), - ("libgles3",) , ("libvulkan",), ("libgbm",)): + ("libgles3",), ("libgbm",)): fullp = p[0] + "-imx" pkgs = "".join(' %s' % i for i in p) d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") -- cgit v1.2.3-54-g00ecf