From patchwork Thu May 4 12:37:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Schultz X-Patchwork-Id: 23386 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89545C7EE23 for ; Thu, 4 May 2023 12:37:56 +0000 (UTC) Received: from mickerik.phytec.de (mickerik.phytec.de [91.26.50.163]) by mx.groups.io with SMTP id smtpd.web10.48559.1683203871577757253 for ; Thu, 04 May 2023 05:37:53 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@phytec.de header.s=a4 header.b=lm1avEKt; spf=pass (domain: phytec.de, ip: 91.26.50.163, mailfrom: d.schultz@phytec.de) DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a4; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1683203872; x=1685795872; h=From:Sender:Reply-To:Subject:Date:Message-ID:To:CC:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=afNfqEl18NZ+9NrDfwy239h/GtrnTaUSEK1JyOC78UU=; b=lm1avEKtdvQIgk81NnZKwTKZ/0Ww6PA8CKGLRDaoNEby+BfBaYQ9R8wT+waRYsNv igrY9vEdLuj1bdiRZT3wmicIcEX1GQoof/Sx5/6ropeYsh4kSG3cCGHMCXe208rH J+sX6fxpPySsLoZfE9h1WTnrihJiDbm+Pm6qb/KXm2o=; X-AuditID: ac14000a-923ff70000007ecb-e7-6453a720ca62 Received: from berlix.phytec.de (Unknown_Domain [172.25.0.12]) (using TLS with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id FE.EC.32459.027A3546; Thu, 4 May 2023 14:37:52 +0200 (CEST) Received: from ls-radium.phytec (172.25.0.11) by Berlix.phytec.de (172.25.0.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Thu, 4 May 2023 14:37:51 +0200 From: Daniel Schultz To: CC: Daniel Schultz Subject: [PATCH kirkstone+ 2/2] recipes-graphics: ti-img-rogue-umlibs: Make -vulkan optional Date: Thu, 4 May 2023 05:37:36 -0700 Message-ID: <20230504123736.1475746-2-d.schultz@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230504123736.1475746-1-d.schultz@phytec.de> References: <20230504123736.1475746-1-d.schultz@phytec.de> MIME-Version: 1.0 X-Originating-IP: [172.25.0.11] X-ClientProxiedBy: Berlix.phytec.de (172.25.0.12) To Berlix.phytec.de (172.25.0.12) X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrALMWRmVeSWpSXmKPExsWyRpKBR1dheXCKQdc8ZYu5X26xOTB6zDz1 iDmAMYrLJiU1J7MstUjfLoEr48yxxUwFx3grTp7+zNTAuJi7i5GTQ0LAROJT3zWmLkYuDiGB JUwSC7f8Y4Zw7jNKLO5exQpSxSagJXFny1xmEFtEQEVi4rZ5QHEODmYBDYn2Z0wgYWGBGIkj k64xgtgsQCVNp7rZQGxeASuJ7nv/WSCWyUvMvPSdHcTmFLCWuLtyNTPIGCGgmtY5BhDlghIn Zz4BK2cGKm/eOpsZwpaQOPjiBZgtJKAgMXvbZEaYkdPOvWaGsEMltn7ZzjSBUWgWklGzkIya hWTUAkbmVYxCuZnJ2alFmdl6BRmVJanJeimpmxhBoSrCwLWDsW+OxyFGJg7GQ4wSHMxKIrwf Cv1ShHhTEiurUovy44tKc1KLDzFKc7AoifPe72FKFBJITyxJzU5NLUgtgskycXBKNTBGPpxY dnXTqsv2ks8yLv69M6XUXqm8+rKi2GvxN+EXxCVSzhmzhd6d67n0cGiD8ttV1kuXvRF2z36l cPWe+2QXz//sx+qe6mzbVh7k82XbvKULOZ2+HtS66f/rZN652MUr1wa3mC3zXx9kOe3E5wff AgKesnAZbFQVudgcxRHVVC/ktGTpHwMZJZbijERDLeai4kQA0JcdSkMCAAA= List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 04 May 2023 12:37:56 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16483 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 --- .../libgles/ti-img-rogue-umlibs_23.1.6404501.bb | 15 +++++++++++++-- 1 file 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..a6ed57f4 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"