diff -Nru xrt-202020.2.8.726/debian/changelog xrt-202020.2.8.726/debian/changelog --- xrt-202020.2.8.726/debian/changelog 2021-05-28 12:19:28.000000000 +0200 +++ xrt-202020.2.8.726/debian/changelog 2021-08-13 11:30:48.000000000 +0200 @@ -1,3 +1,10 @@ +xrt (202020.2.8.726-0ubuntu8) impish; urgency=medium + + * Add OpenCL configuration file (LP: #1939613) + * Fix FTBFS with latest impish gcc + + -- Alfonso Sanchez-Beato (email Canonical) Fri, 13 Aug 2021 11:30:48 +0200 + xrt (202020.2.8.726-0ubuntu7) impish; urgency=medium * Fix patches description diff -Nru xrt-202020.2.8.726/debian/patches/add-missing-header.patch xrt-202020.2.8.726/debian/patches/add-missing-header.patch --- xrt-202020.2.8.726/debian/patches/add-missing-header.patch 1970-01-01 01:00:00.000000000 +0100 +++ xrt-202020.2.8.726/debian/patches/add-missing-header.patch 2021-08-13 11:30:48.000000000 +0200 @@ -0,0 +1,23 @@ +Description: Add missing header to avoid FTBFS + Fix an FTBFS happening now in impish, that is triggered by not + including a header in xclbin_parser.h. + . + xrt (202020.2.8.726-0ubuntu8) impish; urgency=medium + . + * Add OpenCL configuration file (LP: #1939613) + * Fix FTBFS with latest impish gcc +Author: Alfonso Sanchez-Beato (email Canonical) +Origin: vendor +Forwarded: no +Last-Update: 2021-08-13 + +--- xrt-202020.2.8.726.orig/src/runtime_src/core/common/xclbin_parser.h ++++ xrt-202020.2.8.726/src/runtime_src/core/common/xclbin_parser.h +@@ -19,6 +19,7 @@ + + #include "core/common/config.h" + #include "xclbin.h" ++#include + #include + #include + diff -Nru xrt-202020.2.8.726/debian/patches/fix-new-gcc-error.patch xrt-202020.2.8.726/debian/patches/fix-new-gcc-error.patch --- xrt-202020.2.8.726/debian/patches/fix-new-gcc-error.patch 1970-01-01 01:00:00.000000000 +0100 +++ xrt-202020.2.8.726/debian/patches/fix-new-gcc-error.patch 2021-08-13 11:30:48.000000000 +0200 @@ -0,0 +1,31 @@ +Description: Fix new gcc error due to ambiguity in parenthesis + Fix an FTBFS happening now in impish, that is triggered by an ambiguity + in parentheseis. + . + xrt (202020.2.8.726-0ubuntu8) impish; urgency=medium + . + * Add OpenCL configuration file (LP: #1939613) + * Fix FTBFS with latest impish gcc +Author: Alfonso Sanchez-Beato (email Canonical) +Origin: vendor +Forwarded: no +Last-Update: 2021-08-13 + +--- xrt-202020.2.8.726.orig/src/runtime_src/core/pcie/linux/plugin/xdp/hal_profile.h ++++ xrt-202020.2.8.726/src/runtime_src/core/pcie/linux/plugin/xdp/hal_profile.h +@@ -250,12 +250,12 @@ void warning_hal_callbacks() ; + #define READ_CB xdphal::ReadCallLogger read_call_logger(handle, size /*, space, offset, hostBuf*/); + #define REG_WRITE_CB xdphal::RegWriteCallLogger reg_write_call_logger(handle, ipIndex, offset); + #define REG_READ_CB xdphal::RegReadCallLogger reg_read_call_logger(handle, ipIndex, offset); +-#define PROBE_CB xdphal::ProbeCallLogger probe_call_logger(); ++#define PROBE_CB xdphal::ProbeCallLogger probe_call_logger; + #define LOCK_DEVICE_CB xdphal::LockDeviceCallLogger lock_device_call_logger(handle); + #define UNLOCK_DEVICE_CB xdphal::UnLockDeviceCallLogger unlock_device_call_logger(handle); +-#define OPEN_CB xdphal::OpenCallLogger open_call_logger(); ++#define OPEN_CB xdphal::OpenCallLogger open_call_logger; + #define CLOSE_CB xdphal::CloseCallLogger close_call_logger(handle); +-#define OPEN_CONTEXT_CB xdphal::OpenContextCallLogger open_context_call_logger(); ++#define OPEN_CONTEXT_CB xdphal::OpenContextCallLogger open_context_call_logger; + #define CLOSE_CONTEXT_CB xdphal::CloseContextCallLogger close_context_call_logger(handle); + #define LOAD_XCLBIN_CB xdphal::LoadXclbinCallLogger xclbin_call_logger(handle, buffer) ; + diff -Nru xrt-202020.2.8.726/debian/patches/series xrt-202020.2.8.726/debian/patches/series --- xrt-202020.2.8.726/debian/patches/series 2021-05-24 15:13:06.000000000 +0200 +++ xrt-202020.2.8.726/debian/patches/series 2021-08-13 11:30:48.000000000 +0200 @@ -1,2 +1,4 @@ install-zocl-files-if-embedded.patch ignore-deprecated-declarations.patch +add-missing-header.patch +fix-new-gcc-error.patch diff -Nru xrt-202020.2.8.726/debian/rules xrt-202020.2.8.726/debian/rules --- xrt-202020.2.8.726/debian/rules 2021-05-24 15:18:59.000000000 +0200 +++ xrt-202020.2.8.726/debian/rules 2021-08-13 11:30:24.000000000 +0200 @@ -28,4 +28,7 @@ then cp -rf src/runtime_src/core/edge/drm/zocl/* $$dkms_folder/driver/zocl/; \ fi # script end +# Create configuration file for OpenCL + mkdir -p debian/tmp/etc/OpenCL/vendors/ + echo "libxilinxopencl.so" > debian/tmp/etc/OpenCL/vendors/xilinx.icd dh_install diff -Nru xrt-202020.2.8.726/debian/xrt-embedded.install xrt-202020.2.8.726/debian/xrt-embedded.install --- xrt-202020.2.8.726/debian/xrt-embedded.install 2020-10-02 11:23:19.000000000 +0200 +++ xrt-202020.2.8.726/debian/xrt-embedded.install 2021-08-13 11:29:45.000000000 +0200 @@ -1,3 +1,4 @@ +etc/OpenCL/ usr/bin/ usr/include/ usr/lib/