diff options
author | Daniel Schultz <d.schultz@phytec.de> | 2023-05-04 05:37:36 -0700 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-05-08 11:12:38 -0500 |
commit | d3c2c6e8097c9913982a4d0746956949da81e058 (patch) | |
tree | f5faa056409760761a98cad730adbfb171836e8c | |
parent | ab92e0322d7ae25677040cf6c83fc7aa0076753f (diff) | |
download | meta-ti-d3c2c6e8097c9913982a4d0746956949da81e058.tar.gz |
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 <d.schultz@phytec.de>
Tested-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r-- | meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb | 15 |
1 files changed, 13 insertions, 2 deletions
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() { | |||
29 | mv ${D}/lib/firmware ${D}${nonarch_base_libdir} | 29 | mv ${D}/lib/firmware ${D}${nonarch_base_libdir} |
30 | rmdir ${D}/lib | 30 | rmdir ${D}/lib |
31 | fi | 31 | fi |
32 | if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'false', 'true', d)}; then | ||
33 | rm -rf ${D}${libdir}/libVK_IMG.so* | ||
34 | fi | ||
32 | rm -rf "${D}/etc/init.d" | 35 | rm -rf "${D}/etc/init.d" |
33 | } | 36 | } |
34 | 37 | ||
35 | PACKAGES = "${PN}-vulkan ${PN}-tools ${PN}-firmware ${PN}" | 38 | PACKAGES = " \ |
39 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "${PN}-vulkan", "", d)} \ | ||
40 | ${PN}-tools \ | ||
41 | ${PN}-firmware \ | ||
42 | ${PN} \ | ||
43 | " | ||
36 | 44 | ||
37 | FILES:${PN}-vulkan = " \ | 45 | FILES:${PN}-vulkan = " \ |
38 | ${datadir}/vulkan \ | 46 | ${datadir}/vulkan \ |
@@ -56,7 +64,10 @@ RDEPENDS:${PN}-tools = "python3-core" | |||
56 | FILES:${PN}-firmware = "${base_libdir}/firmware/*" | 64 | FILES:${PN}-firmware = "${base_libdir}/firmware/*" |
57 | INSANE_SKIP:${PN}-firmware += "arch" | 65 | INSANE_SKIP:${PN}-firmware += "arch" |
58 | 66 | ||
59 | RRECOMMENDS:${PN} += "${PN}-vulkan ${PN}-tools" | 67 | RRECOMMENDS:${PN} += " \ |
68 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "${PN}-vulkan", "", d)} \ | ||
69 | ${PN}-tools \ | ||
70 | " | ||
60 | RDEPENDS:${PN} += " ${PN}-firmware" | 71 | RDEPENDS:${PN} += " ${PN}-firmware" |
61 | 72 | ||
62 | INSANE_SKIP:${PN} += "already-stripped dev-so" | 73 | INSANE_SKIP:${PN} += "already-stripped dev-so" |