6 files changed, 33 insertions, 5 deletions

diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb
index 464b96fd..7063178a 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb
@@ -11,7 +11,7 @@ LICENSE = "GPLv2 & Apache-2.0"
 # Patch is applied as -p 4 to the src/runtime_src/core/edge directory
 SRC_URI += "file://0001-Fixed-ZOCL-dtbo-path-len-issue-6966.patch;striplevel=5;patchdir=./../../"
 
-S = "${UNPACKDIR}/git/src/runtime_src/core/edge/drm/zocl"
+S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl"
 
 inherit module
 
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb
index 7643b42a..39e9f9fb 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb
@@ -8,7 +8,7 @@ require recipes-xrt/xrt/xrt-${PV}.inc
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"
 LICENSE = "GPL-2.0-or-later & Apache-2.0"
 
-S = "${UNPACKDIR}/git/src/runtime_src/core/edge/drm/zocl"
+S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl"
 
 inherit module
 
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb
index 998ff99c..47efc58a 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
 COMPATIBLE_MACHINE:versal-net = ".*"
 
-S = "${UNPACKDIR}/git/src/runtime_src/core/edge/drm/zocl"
+S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl"
 
 inherit module
 
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb
index 998ff99c..47efc58a 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
 COMPATIBLE_MACHINE:versal-net = ".*"
 
-S = "${UNPACKDIR}/git/src/runtime_src/core/edge/drm/zocl"
+S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl"
 
 inherit module
 
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.319.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.319.bb
index 998ff99c..47efc58a 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.319.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.319.bb
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
 COMPATIBLE_MACHINE:versal-net = ".*"
 
-S = "${UNPACKDIR}/git/src/runtime_src/core/edge/drm/zocl"
+S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl"
 
 inherit module
 
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202420.2.18.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202420.2.18.0.bb
new file mode 100644
index 00000000..e5efd89c
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202420.2.18.0.bb
@@ -0,0 +1,28 @@
+SUMMARY  = "Xilinx Runtime(XRT) driver module"
+DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule"
+
+COMPATIBLE_MACHINE:microblaze = "none"
+
+PROVIDES += "zocl"
+
+require recipes-xrt/xrt/xrt-${PV}.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"
+LICENSE = "GPL-2.0-or-later & Apache-2.0"
+
+COMPATIBLE_MACHINE ?= "^$"
+COMPATIBLE_MACHINE:zynqmp = ".*"
+COMPATIBLE_MACHINE:versal = ".*"
+COMPATIBLE_MACHINE:versal-net = ".*"
+
+S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl"
+
+inherit module
+
+pkg_postinst_ontarget:${PN}() {
+  #!/bin/sh
+  echo "Unloading old XRT Linux kernel modules"
+  ( rmmod zocl || true ) > /dev/null 2>&1
+  echo "Loading new XRT Linux kernel modules"
+  modprobe zocl
+}