From 11e9d111f33491dfde326d5def7a6f7d70bd12a7 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 19 Oct 2022 14:47:02 -0500 Subject: xrt: XRT uses pkgconfig Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb index b8071a65..3beb61eb 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=da5408f748bce8a9851dac18e66f4bcf \ S = "${WORKDIR}/git/src" -inherit cmake +inherit cmake pkgconfig BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf From c58aa90fd30ca3c75442904eddcc47ebef2ac8f7 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 19 Oct 2022 17:28:48 -0500 Subject: xrt: Move from libmetal to libmetal-xlnx Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb index 3beb61eb..884422cc 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb @@ -27,7 +27,7 @@ EXTRA_OECMAKE += " \ PACKAGE_ARCH:versal-ai-core = "${SOC_VARIANT_ARCH}" EXTRA_OECMAKE:append:versal-ai-core = " -DXRT_AIE_BUILD=true" TARGET_CXXFLAGS:append:versal-ai-core = " -DXRT_ENABLE_AIE" -DEPENDS:append:versal-ai-core = " libmetal libxaiengine aiefal" +DEPENDS:append:versal-ai-core = " libmetal-xlnx libxaiengine aiefal" RDEPENDS:${PN}:append:versal-ai-core = " libxaiengine aiefal" EXTRA_OECMAKE:append:versal = " -DXRT_LIBDFX=true" EXTRA_OECMAKE:append:zynqmp = " -DXRT_LIBDFX=true" -- cgit v1.2.3-54-g00ecf From 8aa8e5af31f71e7a29e990fcfa5d463e6d91d264 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 19 Oct 2022 17:29:16 -0500 Subject: xilinx-standalone.inc: Move to xlnx specific versions of libmetal and open-amp Signed-off-by: Mark Hatle --- meta-xilinx-standalone/conf/distro/xilinx-standalone.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc index bf1698a3..57fbf956 100644 --- a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc +++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc @@ -34,8 +34,8 @@ VIRTUAL-RUNTIME_init_manager:xilinx-standalone = "" PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" -PREFERRED_VERSION_libmetal = "${@'standalone' if 'xilinx-standalone-exp' in d.getVar('BBFILE_COLLECTIONS').split() else ''}" -PREFERRED_VERSION_open-amp = "${@'standalone' if 'xilinx-standalone-exp' in d.getVar('BBFILE_COLLECTIONS').split() else ''}" +PREFERRED_VERSION_libmetal-xlnx = "${@'standalone' if 'xilinx-standalone-exp' in d.getVar('BBFILE_COLLECTIONS').split() else ''}" +PREFERRED_VERSION_open-amp-xlnx = "${@'standalone' if 'xilinx-standalone-exp' in d.getVar('BBFILE_COLLECTIONS').split() else ''}" # Hold this until it gets merged in core, we need libc.a and libgloss.a for cross-canadian LIBC_DEPENDENCIES:append = " newlib-staticdev libgloss-staticdev" -- cgit v1.2.3-54-g00ecf