From a82e0e3955a9fc811b9a4ec0a24ed080003ee723 Mon Sep 17 00:00:00 2001 From: Daniel Schultz Date: Thu, 4 May 2023 05:37:36 -0700 Subject: recipes-graphics: ti-img-rogue-umlibs: Make -vulkan optional Only include the ti-img-rogue-umlibs-vulkan package if the DISTRO_FEATURES x11 is enabled. Right now, this recipe has a failed build dependency on images without x11. Signed-off-by: Daniel Schultz Tested-by: Denys Dmytriyenko Signed-off-by: Ryan Eatmon --- .../libgles/ti-img-rogue-umlibs_23.1.6404501.bb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'meta-ti-bsp/recipes-graphics') diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb index c33f8ae0..f22cd1d1 100644 --- a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb @@ -29,10 +29,18 @@ do_install:append() { mv ${D}/lib/firmware ${D}${nonarch_base_libdir} rmdir ${D}/lib fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'false', 'true', d)}; then + rm -rf ${D}${libdir}/libVK_IMG.so* + fi rm -rf "${D}/etc/init.d" } -PACKAGES = "${PN}-vulkan ${PN}-tools ${PN}-firmware ${PN}" +PACKAGES = " \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "${PN}-vulkan", "", d)} \ + ${PN}-tools \ + ${PN}-firmware \ + ${PN} \ +" FILES:${PN}-vulkan = " \ ${datadir}/vulkan \ @@ -56,7 +64,10 @@ RDEPENDS:${PN}-tools = "python3-core" FILES:${PN}-firmware = "${base_libdir}/firmware/*" INSANE_SKIP:${PN}-firmware += "arch" -RRECOMMENDS:${PN} += "${PN}-vulkan ${PN}-tools" +RRECOMMENDS:${PN} += " \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "${PN}-vulkan", "", d)} \ + ${PN}-tools \ +" RDEPENDS:${PN} += " ${PN}-firmware" INSANE_SKIP:${PN} += "already-stripped dev-so" -- cgit v1.2.3-54-g00ecf