From patchwork Tue Jan 14 01:59:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 55465 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 8C2DDC02183 for ; Tue, 14 Jan 2025 02:00:10 +0000 (UTC) Received: from lelvem-ot01.ext.ti.com (lelvem-ot01.ext.ti.com [198.47.23.234]) by mx.groups.io with SMTP id smtpd.web10.35451.1736820008855879596 for ; Mon, 13 Jan 2025 18:00:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=G8CC5mh4; spf=pass (domain: ti.com, ip: 198.47.23.234, mailfrom: rs@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelvem-ot01.ext.ti.com (8.15.2/8.15.2) with ESMTPS id 50E208Kc3607577 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 13 Jan 2025 20:00:08 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1736820008; bh=FOs2KnoaDCLiaVeSWxlgSo6ULU0H5aQOxHC/QJgfpcc=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=G8CC5mh4om0ovuiMzdxw48wkn0aC8nqlIueRfxOHpuEbiUxNuAt66TF0FNii1+3PZ jVQqCnrKIU0kYDut4941yMD2TQ3PMtutdU9vjqr8T8nKe+6bRNo0cmm2KTXhXCx2Jp Sr03MNMq32cEuK/NMSbbc+9pZ9hRvcDBl94bN+3o= Received: from DLEE107.ent.ti.com (dlee107.ent.ti.com [157.170.170.37]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTP id 50E208Bn016781; Mon, 13 Jan 2025 20:00:08 -0600 Received: from DLEE113.ent.ti.com (157.170.170.24) by DLEE107.ent.ti.com (157.170.170.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 13 Jan 2025 20:00:07 -0600 Received: from lelvsmtp5.itg.ti.com (10.180.75.250) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Mon, 13 Jan 2025 20:00:07 -0600 Received: from rs-desk.dhcp.ti.com (rs-desk.dhcp.ti.com [128.247.81.144]) by lelvsmtp5.itg.ti.com (8.15.2/8.15.2) with ESMTP id 50E2059J124892; Mon, 13 Jan 2025 20:00:07 -0600 From: To: , CC: , , Subject: [meta-ti][master][PATCH 4/4] ti-img-rogue-umlibs: filter binaries post install Date: Mon, 13 Jan 2025 19:59:45 -0600 Message-ID: <20250114015945.3554905-5-rs@ti.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250114015945.3554905-1-rs@ti.com> References: <20250114015945.3554905-1-rs@ti.com> MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea 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 ; Tue, 14 Jan 2025 02:00:10 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18192 From: Randolph Sapp No reason to do this pre install now that my python function can evaluate file paths. Also, this may have been causing issues with state when attempting to switch between opencl enabled/disabled builds. Signed-off-by: Randolph Sapp --- .../powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb index 0de66b72..b8153711 100644 --- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb +++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb @@ -45,7 +45,7 @@ PACKAGECONFIG[opencl] = ",,,,${OPENCL_PACKAGES}" def get_file_list(package_list_var, d): file_list = [] package_list = d.getVar(package_list_var) - prefix = f"{d.getVar('S')}/" + prefix = f"{d.getVar('D')}/" if package_list: for package in package_list.split(): package_file_string = d.getVar(f"FILES:{package}") @@ -54,7 +54,7 @@ def get_file_list(package_list_var, d): file_list.append(f"{prefix}{package_file}") return " ".join(file_list) -do_install:prepend() { +do_install:append() { if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then for file in ${@get_file_list('GLES_PACKAGES', d)}; do rm -rf ${file} @@ -71,13 +71,13 @@ do_install:prepend() { done fi if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then - if [ -e ${S}/lib/firmware ]; then - mv ${S}/lib/firmware ${S}${nonarch_base_libdir} + if [ -e ${D}/lib/firmware ]; then + mv ${D}/lib/firmware ${D}${nonarch_base_libdir} fi fi # clean up any empty directories - find "${S}" -empty -type d -delete + find "${D}" -empty -type d -delete } GLES_PACKAGES = "libgles1-rogue libgles2-rogue libgles3-rogue"