I literally merged this out to master about 30mins ago.
On 12/7/2022 4:23 PM, Denys Dmytriyenko wrote:
Ping?
On Fri, Nov 18, 2022 at 09:07:49PM +0000, Denys Dmytriyenko wrote:
From: Denys Dmytriyenko <[email protected]>
Replace "require" with "include" to load ti-paths.inc and not break
parsing when meta-ti-extras is not in the BBLAYERS list.
As ti-paths.inc is only needed to define TI_K3_SECDEV_INSTALL_DIR
for ti-k3-secdev when TI_SECURE_DEV_PKG_K3 is not set and building
for K3 HS platforms. Since ti-k3-secdev resides in meta-ti-extras,
the soft dependency will still work fine and give a build error
"Nothing PROVIDES 'ti-k3-secdev-native'" when it is needed.
Also, since TI_K3_SECDEV_INSTALL_DIR can now be undefined, use
d.getVar() to access it ensuring it doesn't break the condition.
Reported-by: Daniel Díaz <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index e89a6855..c99cd660 100644
--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -1,5 +1,5 @@
require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
-require recipes-ti/includes/ti-paths.inc
+include recipes-ti/includes/ti-paths.inc
DEPENDS = "openssl-native u-boot-mkimage-native dtc-native virtual/bootloader"
DEPENDS:remove:am65xx-evm-k3r5 = "virtual/bootloader"
@@ -20,7 +20,7 @@ COMPATIBLE_MACHINE:aarch64 = "null"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-TI_SECURE_DEV_PKG = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or '${TI_K3_SECDEV_INSTALL_DIR}' }"
+TI_SECURE_DEV_PKG = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or
d.getVar('TI_K3_SECDEV_INSTALL_DIR') }"
export TI_SECURE_DEV_PKG
SYSFW_SOC ?= "unknown"
--
2.25.1
--
Ryan Eatmon [email protected]
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#15430):
https://lists.yoctoproject.org/g/meta-ti/message/15430
Mute This Topic: https://lists.yoctoproject.org/mt/95121729/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
