From 574eba1a8e952a0b0dae4e0848dd7fcd80eee80f Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 22 Jun 2022 14:14:44 -0700 Subject: Revert "xrt: Add workaround for xrt/xrt_kernel.h issue" This reverts commit ca0ae12186c4d13305d72cc636e9107a67e38ad2. No longer necessary Signed-off-by: Mark Hatle --- ...h-experimental-xrt_hw_context.h-requries-.patch | 31 ---------------------- meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb | 3 --- 2 files changed, 34 deletions(-) delete mode 100644 meta-xilinx-core/recipes-xrt/xrt/xrt/0001-xrt_kernel.h-experimental-xrt_hw_context.h-requries-.patch (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt/0001-xrt_kernel.h-experimental-xrt_hw_context.h-requries-.patch b/meta-xilinx-core/recipes-xrt/xrt/xrt/0001-xrt_kernel.h-experimental-xrt_hw_context.h-requries-.patch deleted file mode 100644 index 05b59c35..00000000 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt/0001-xrt_kernel.h-experimental-xrt_hw_context.h-requries-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 16adf8611f9b6de41c7fa37f0222441720efe503 Mon Sep 17 00:00:00 2001 -From: Mark Hatle -Date: Mon, 6 Jun 2022 14:11:47 -0700 -Subject: [PATCH] xrt_kernel.h: experimental/xrt_hw_context.h requries C++ - -Move the include under the cplusplus check to avoid the error: - # error xrt_hwcontext is only implemented for C++ - -Signed-off-by: Mark Hatle ---- - src/runtime_src/core/include/xrt/xrt_kernel.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/runtime_src/core/include/xrt/xrt_kernel.h b/src/runtime_src/core/include/xrt/xrt_kernel.h -index bbc9a30d5..93445dc81 100644 ---- a/src/runtime_src/core/include/xrt/xrt_kernel.h -+++ b/src/runtime_src/core/include/xrt/xrt_kernel.h -@@ -11,9 +11,8 @@ - #include "xrt/xrt_device.h" - #include "xrt/xrt_uuid.h" - --#include "experimental/xrt_hw_context.h" -- - #ifdef __cplusplus -+# include "experimental/xrt_hw_context.h" - # include "experimental/xrt_enqueue.h" - # include - # include --- -2.17.1 - diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb index fc55b3d3..4a697bf4 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb @@ -10,9 +10,6 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=da5408f748bce8a9851dac18e66f4bcf \ file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 " -# Temporary fix -SRC_URI += "file://0001-xrt_kernel.h-experimental-xrt_hw_context.h-requries-.patch;striplevel=2" - S = "${WORKDIR}/git/src" inherit cmake -- cgit v1.2.3-54-g00ecf