Skip to contentSkip to conversation

ocl-icd: Upgrade to latest

PATCH Superseded Khem Raj 2 participants 4 messages Aug 12, 2020 – Aug 14, 2020

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH v2 1/1 ocl-icd: Upgrade to latest

License-Update: Update copyrights [1]

Install CL/cl_icd.h as its needed by opencl-icd-loader

Do not provide libOpenCL.so these are alrwady provided by OpenCL 1.2 Installable Client Driver

[1] https://github.com/OCL-dev/ocl-icd/commit/3920205736afbb67729e9c73c7b4c6fdb3fcb327#diff-7116ef0705885343c9e1b2171a06be0e

---
v2: Fix library conflicts and license checksums

 meta-oe/recipes-core/opencl/ocl-icd_git.bb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
meta-oe/recipes-core/opencl/ocl-icd_git.bb +8 -2
index d14ec53e3d..a65c7618b8 100644
@@ -3,12 +3,12 @@ DESCRIPTION = "Open Source alternative to vendor specific OpenCL ICD loaders."
 
 # The LICENSE is BSD 2-Clause "Simplified" License
 LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=232257bbf7320320725ca9529d3782ab"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1238d5bccbb6bda30654e48dcc0a554b"
 
 SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https"
 
 PV = "2.2.12+git${SRCPV}"
-SRCREV = "af79aebe4649f30dbd711c1bf6fc661eac6e5f01"
+SRCREV = "a9e57b199ff1e8d03fa3e5c53c5544de3dc72fe6"
 
 S = "${WORKDIR}/git"
 
@@ -16,4 +16,10 @@ inherit autotools
 
 DEPENDS = "ruby-native"
 
+
+do_install_append() {
+    install -Dm 0644 ${S}/khronos-headers/CL/cl_icd.h ${D}${includedir}/CL/cl_icd.h
+    rm -rf ${D}${libdir}/libOpenCL.so*
+}
+
 BBCLASSEXTEND = "native"
Signature · 1 line
2.28.0
#1 lore raw
Quoted 6 lines · Khem Raj

License-Update: Update copyrights [1]

Install CL/cl_icd.h as its needed by opencl-icd-loader

Do not provide libOpenCL.so these are alrwady provided by OpenCL 1.2 Installable Client Driver

Aren't both of these different implementations of libOpenCL? Project depending on ocl-icd shouldn't need to depend on opencl-icd-loader I think.

Thanks,

Anuj

Quoted 47 lines

[1]
https://github.com/OCL-dev/ocl-icd/commit/3920205736afbb67729e9c73c7b4c6fdb3fcb327#diff-7116ef0705885343c9e1b2171a06be0e

---
v2: Fix library conflicts and license checksums

 meta-oe/recipes-core/opencl/ocl-icd_git.bb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
meta- renamed from meta-oe/recipes-core/opencl/ocl-icd_git.bb +0 -0

oe/recipes-core/opencl/ocl-icd_git.bb
index d14ec53e3d..a65c7618b8 100644

meta-oe/recipes-core/opencl/ocl-icd_git.bb +0 -0
@@ -3,12 +3,12 @@ DESCRIPTION = "Open Source alternative to vendor

specific OpenCL ICD loaders."

# The LICENSE is BSD 2-Clause "Simplified" License LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=232257bbf7320320725ca9529d3782ab" +LIC_FILES_CHKSUM = "file://COPYING;md5=1238d5bccbb6bda30654e48dcc0a554b"

SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https"

PV = "2.2.12+git${SRCPV}"

meta-oe/recipes-core/opencl/ocl-icd_git.bb +4 -1
-SRCREV = "af79aebe4649f30dbd711c1bf6fc661eac6e5f01"
+SRCREV = "a9e57b199ff1e8d03fa3e5c53c5544de3dc72fe6"
 
 S = "${WORKDIR}/git"
@@ -16,4 +16,10 @@ inherit autotools
 
 DEPENDS = "ruby-native"
 
+
+do_install_append() {
+    install -Dm 0644 ${S}/khronos-headers/CL/cl_icd.h

${D}${includedir}/CL/cl_icd.h

meta-oe/recipes-core/opencl/ocl-icd_git.bb +3 -0
+    rm -rf ${D}${libdir}/libOpenCL.so*
+}
+
 BBCLASSEXTEND = "native"
author
#2 lore raw
Quoted 4 lines · Anuj Mittal
Quoted 2 lines · Khem Raj

License-Update: Update copyrights [1]

Quoted 8 lines
Quoted 4 lines

Install CL/cl_icd.h as its needed by opencl-icd-loader

Do not provide libOpenCL.so these are alrwady provided by OpenCL 1.2 Installable Client Driver

Aren't both of these different implementations of libOpenCL? Project depending on ocl-icd shouldn't need to depend on opencl-icd-loader I think.

yes they are different, for meta-oe khronos implementation is default.

Quoted 53 lines

Thanks,

Anuj

Quoted 47 lines

[1]
https://github.com/OCL-dev/ocl-icd/commit/3920205736afbb67729e9c73c7b4c6fdb3fcb327#diff-7116ef0705885343c9e1b2171a06be0e

---
v2: Fix library conflicts and license checksums

 meta-oe/recipes-core/opencl/ocl-icd_git.bb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
meta- renamed from meta-oe/recipes-core/opencl/ocl-icd_git.bb +0 -0

oe/recipes-core/opencl/ocl-icd_git.bb
index d14ec53e3d..a65c7618b8 100644

meta-oe/recipes-core/opencl/ocl-icd_git.bb +0 -0
@@ -3,12 +3,12 @@ DESCRIPTION = "Open Source alternative to vendor

specific OpenCL ICD loaders."

# The LICENSE is BSD 2-Clause "Simplified" License LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=232257bbf7320320725ca9529d3782ab" +LIC_FILES_CHKSUM = "file://COPYING;md5=1238d5bccbb6bda30654e48dcc0a554b"

SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https"

PV = "2.2.12+git${SRCPV}"

meta-oe/recipes-core/opencl/ocl-icd_git.bb +4 -1
-SRCREV = "af79aebe4649f30dbd711c1bf6fc661eac6e5f01"
+SRCREV = "a9e57b199ff1e8d03fa3e5c53c5544de3dc72fe6"
 
 S = "${WORKDIR}/git"
@@ -16,4 +16,10 @@ inherit autotools
 
 DEPENDS = "ruby-native"
 
+
+do_install_append() {
+    install -Dm 0644 ${S}/khronos-headers/CL/cl_icd.h

${D}${includedir}/CL/cl_icd.h

meta-oe/recipes-core/opencl/ocl-icd_git.bb +3 -0
+    rm -rf ${D}${libdir}/libOpenCL.so*
+}
+
 BBCLASSEXTEND = "native"
#3 lore raw
Quoted 11 lines · Khem Raj
Quoted 9 lines · Anuj Mittal
Quoted 7 lines · Khem Raj

License-Update: Update copyrights [1]

Install CL/cl_icd.h as its needed by opencl-icd-loader

Do not provide libOpenCL.so these are alrwady provided by OpenCL 1.2
Installable Client Driver

Quoted 8 lines
Quoted 5 lines

Aren't both of these different implementations of libOpenCL? Project
depending on ocl-icd shouldn't need to depend on opencl-icd-loader I
think.

yes they are different, for meta-oe khronos implementation is default.

I am not sure what that means. Shouldn't choosing the implementation be either a distro or a package decision?

It looks like this was done because a DEPENDS was added in opencl-icd- loader on ocl-icd. That DEPENDS I believe is incorrect and this recipe does not need to install that header and remove the library ...

Thanks,

Anuj

Quoted 52 lines
Quoted 52 lines

Thanks,

Anuj

Quoted 47 lines

[1]
https://github.com/OCL-dev/ocl-icd/commit/3920205736afbb67729e9c73c7b4c6fdb3fcb327#diff-7116ef0705885343c9e1b2171a06be0e

---
v2: Fix library conflicts and license checksums

 meta-oe/recipes-core/opencl/ocl-icd_git.bb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
meta- renamed from meta-oe/recipes-core/opencl/ocl-icd_git.bb +0 -0

oe/recipes-core/opencl/ocl-icd_git.bb
index d14ec53e3d..a65c7618b8 100644

meta-oe/recipes-core/opencl/ocl-icd_git.bb +0 -0
@@ -3,12 +3,12 @@ DESCRIPTION = "Open Source alternative to

vendor
specific OpenCL ICD loaders."

# The LICENSE is BSD 2-Clause "Simplified" License LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=232257bbf7320320725ca9529d3782ab" +LIC_FILES_CHKSUM = "file://COPYING;md5=1238d5bccbb6bda30654e48dcc0a554b"

SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https"

PV = "2.2.12+git${SRCPV}"

meta-oe/recipes-core/opencl/ocl-icd_git.bb +4 -1
-SRCREV = "af79aebe4649f30dbd711c1bf6fc661eac6e5f01"
+SRCREV = "a9e57b199ff1e8d03fa3e5c53c5544de3dc72fe6"
 
 S = "${WORKDIR}/git"
@@ -16,4 +16,10 @@ inherit autotools
 
 DEPENDS = "ruby-native"
 
+
+do_install_append() {
+    install -Dm 0644 ${S}/khronos-headers/CL/cl_icd.h

${D}${includedir}/CL/cl_icd.h

meta-oe/recipes-core/opencl/ocl-icd_git.bb +3 -0
+    rm -rf ${D}${libdir}/libOpenCL.so*
+}
+
 BBCLASSEXTEND = "native"