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

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>
(cherry picked from commit 3f3d692d66be7d9f147364828572e57dd87702eb)
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

13 files changed, 9 insertions, 18 deletions

diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index f0a233cf..349463bf 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -29,7 +29,7 @@ LAYERSERIES_COMPAT_xilinx = "scarthgap"
 
 SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   *->xrt \
-  *->kernel-module-zocl \
+  *->zocl \
   *->cairo \
   *->libepoxy \
   *->gstreamer1.0-plugins-base \
@@ -80,7 +80,7 @@ XRT_ZOCL_VERSION[v2023.1] = "202310.2.15.0"
 XRT_ZOCL_VERSION[v2023.2] = "202320.2.16.0"
 XRT_ZOCL_VERSION[v2024.1] = "202410.2.17.0"
 PREFERRED_VERSION_xrt ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
-PREFERRED_VERSION_kernel-module-zocl ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
+PREFERRED_VERSION_zocl ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
 # AI-Engine
 AIEFAL_VERSION[v2022.1] = "1.4"
diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb
index 1d4ab5a3..b4de4fe6 100644
--- a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb
@@ -22,7 +22,7 @@ S = "${WORKDIR}/git"
 
 inherit cmake update-rc.d systemd
 
-DEPENDS += " libwebsockets inotify-tools libdfx kernel-module-zocl libdrm"
+DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm"
 RDEPENDS:${PN} += " fru-print"
 EXTRA_OECMAKE += " \
                -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \
diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb
index b15fff74..a4149d39 100644
--- a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb
+++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb
@@ -22,7 +22,7 @@ S = "${WORKDIR}/git"
 
 inherit cmake update-rc.d systemd
 
-DEPENDS += " libwebsockets inotify-tools libdfx kernel-module-zocl libdrm"
+DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm"
 RDEPENDS:${PN} += " freeipmi"
 EXTRA_OECMAKE += " \
                -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \
diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb
index 60096e33..d09ab51e 100644
--- a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb
+++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb
@@ -22,7 +22,7 @@ S = "${WORKDIR}/git"
 
 inherit cmake update-rc.d systemd
 
-DEPENDS += " libwebsockets inotify-tools libdfx kernel-module-zocl libdrm systemd"
+DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm systemd"
 RDEPENDS:${PN} += " freeipmi"
 EXTRA_OECMAKE += " \
                -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \
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 c42e9a65..0e9dd3db 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 cc5a9ed5..7107c3df 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 6d7d1257..cad8ccee 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 a780684f..5824ae9c 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 \
diff --git a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202210.2.13.479.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb
index a7c7e540..7063178a 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202210.2.13.479.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb
@@ -1,7 +1,6 @@
 SUMMARY  = "Xilinx Runtime(XRT) driver module"
 DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule"
 
-PROVIDES += "zocl"
 
 require recipes-xrt/xrt/xrt-${PV}.inc
 
diff --git a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202220.2.14.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb
index 8676639a..39e9f9fb 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202220.2.14.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb
@@ -3,8 +3,6 @@ DESCRIPTION = "Xilinx Runtime driver module provides memory management and compu
 
 COMPATIBLE_MACHINE:microblaze = "none"
 
-PROVIDES += "zocl"
-
 require recipes-xrt/xrt/xrt-${PV}.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"
diff --git a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb
index b91572f9..24f69aec 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb
@@ -3,8 +3,6 @@ DESCRIPTION = "Xilinx Runtime driver module provides memory management and compu
 
 COMPATIBLE_MACHINE:microblaze = "none"
 
-PROVIDES += "zocl"
-
 require recipes-xrt/xrt/xrt-${PV}.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"
diff --git a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202310.2.15.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb
index b91572f9..24f69aec 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202310.2.15.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb
@@ -3,8 +3,6 @@ DESCRIPTION = "Xilinx Runtime driver module provides memory management and compu
 
 COMPATIBLE_MACHINE:microblaze = "none"
 
-PROVIDES += "zocl"
-
 require recipes-xrt/xrt/xrt-${PV}.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"
diff --git a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202320.2.16.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.0.bb
index b91572f9..24f69aec 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202320.2.16.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.0.bb
@@ -3,8 +3,6 @@ DESCRIPTION = "Xilinx Runtime driver module provides memory management and compu
 
 COMPATIBLE_MACHINE:microblaze = "none"
 
-PROVIDES += "zocl"
-
 require recipes-xrt/xrt/xrt-${PV}.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"