diff options
author | Mark Hatle <mark.hatle@amd.com> | 2024-06-10 15:36:43 -0600 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2024-06-10 17:26:23 -0600 |
commit | 62523c2bc42b6b0c5d795373e5110a5c07ed52d8 (patch) | |
tree | 0e797e6a330276e9564f8226b95048b0051f724d /meta-xilinx-core/recipes-bsp | |
parent | e59299a3016e7b814591400d1a2a5a08d3342ae2 (diff) | |
download | meta-xilinx-scarthgap.tar.gz |
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>
Diffstat (limited to 'meta-xilinx-core/recipes-bsp')
-rw-r--r-- | meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb | 2 | ||||
-rw-r--r-- | meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb | 2 | ||||
-rw-r--r-- | meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb | 2 |
3 files changed, 3 insertions, 3 deletions
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" | |||
22 | 22 | ||
23 | inherit cmake update-rc.d systemd | 23 | inherit cmake update-rc.d systemd |
24 | 24 | ||
25 | DEPENDS += " libwebsockets inotify-tools libdfx kernel-module-zocl libdrm" | 25 | DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm" |
26 | RDEPENDS:${PN} += " fru-print" | 26 | RDEPENDS:${PN} += " fru-print" |
27 | EXTRA_OECMAKE += " \ | 27 | EXTRA_OECMAKE += " \ |
28 | -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \ | 28 | -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" | |||
22 | 22 | ||
23 | inherit cmake update-rc.d systemd | 23 | inherit cmake update-rc.d systemd |
24 | 24 | ||
25 | DEPENDS += " libwebsockets inotify-tools libdfx kernel-module-zocl libdrm" | 25 | DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm" |
26 | RDEPENDS:${PN} += " freeipmi" | 26 | RDEPENDS:${PN} += " freeipmi" |
27 | EXTRA_OECMAKE += " \ | 27 | EXTRA_OECMAKE += " \ |
28 | -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \ | 28 | -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" | |||
22 | 22 | ||
23 | inherit cmake update-rc.d systemd | 23 | inherit cmake update-rc.d systemd |
24 | 24 | ||
25 | DEPENDS += " libwebsockets inotify-tools libdfx kernel-module-zocl libdrm systemd" | 25 | DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm systemd" |
26 | RDEPENDS:${PN} += " freeipmi" | 26 | RDEPENDS:${PN} += " freeipmi" |
27 | EXTRA_OECMAKE += " \ | 27 | EXTRA_OECMAKE += " \ |
28 | -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \ | 28 | -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \ |