Revert "kernel-module-zocl: Rename from zocl"HEADmaster

This reverts commit 60542eb1dea413c631330524836412cfefc933bb.

This also makes the same change to 2024.1 version.

This change caused:

ERROR: core-image-minimal-1.0-r0 do_rootfs: Unable to find package with name 'kernel-module-zocl' in SPDX file .../tmp/deploy/spdx/by-hash/zynqmp_generic/sstate:kernel-module-zocl:zynqmp_generic-poky-linux:202410.2.17.0:r0:zynqmp_generic:12:/kernel-module-zocl-6.6.10-xilinx-g3af4295e00ef.spdx.json

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

4 files changed, 4 insertions, 4 deletions

diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb
index ba9d7893..49cfa228 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb
@@ -21,7 +21,7 @@ BBCLASSEXTEND = "native nativesdk"
 
 # util-linux is for libuuid-dev.
 DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson"
-RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})"
+RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})"
 
 EXTRA_OECMAKE += " \
                 -DCMAKE_BUILD_TYPE=Release \
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202220.2.14.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202220.2.14.0.bb
index 0846b05a..f686a746 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202220.2.14.0.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202220.2.14.0.bb
@@ -20,7 +20,7 @@ BBCLASSEXTEND = "native nativesdk"
 
 # util-linux is for libuuid-dev.
 DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson"
-RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})"
+RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})"
 
 EXTRA_OECMAKE += " \
                 -DCMAKE_BUILD_TYPE=Release \
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb
index 99164115..3c93789f 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb
@@ -24,7 +24,7 @@ BBCLASSEXTEND = "native nativesdk"
 
 # util-linux is for libuuid-dev.
 DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson libdfx"
-RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})"
+RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})"
 
 EXTRA_OECMAKE += " \
                 -DCMAKE_BUILD_TYPE=Release \
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb
index dafda422..e14f03c1 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb
@@ -25,7 +25,7 @@ BBCLASSEXTEND = "native nativesdk"
 
 # util-linux is for libuuid-dev.
 DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson libdfx"
-RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})"
+RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})"
 
 EXTRA_OECMAKE += " \
                 -DCMAKE_BUILD_TYPE=Release \