All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-oe][PATCH v2] ocl-icd: Upgrade to latest
@ 2020-08-12  7:50 Khem Raj
  2020-08-14  4:11 ` [oe] " Anuj Mittal
  0 siblings, 1 reply; 4+ messages in thread
From: Khem Raj @ 2020-08-12  7:50 UTC (permalink / raw)
  To: openembedded-devel; +Cc: 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

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

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
v2: Fix library conflicts and license checksums

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

diff --git a/meta-oe/recipes-core/opencl/ocl-icd_git.bb b/meta-oe/recipes-core/opencl/ocl-icd_git.bb
index d14ec53e3d..a65c7618b8 100644
--- a/meta-oe/recipes-core/opencl/ocl-icd_git.bb
+++ b/meta-oe/recipes-core/opencl/ocl-icd_git.bb
@@ -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"
-- 
2.28.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [oe] [meta-oe][PATCH v2] ocl-icd: Upgrade to latest
  2020-08-12  7:50 [meta-oe][PATCH v2] ocl-icd: Upgrade to latest Khem Raj
@ 2020-08-14  4:11 ` Anuj Mittal
  2020-08-14  4:22   ` Khem Raj
  0 siblings, 1 reply; 4+ messages in thread
From: Anuj Mittal @ 2020-08-14  4:11 UTC (permalink / raw)
  To: raj.khem, openembedded-devel

On Wed, 2020-08-12 at 00:50 -0700, Khem Raj wrote:
> 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

> 
> [1] 
> https://github.com/OCL-dev/ocl-icd/commit/3920205736afbb67729e9c73c7b4c6fdb3fcb327#diff-7116ef0705885343c9e1b2171a06be0e
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> v2: Fix library conflicts and license checksums
> 
>  meta-oe/recipes-core/opencl/ocl-icd_git.bb | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-oe/recipes-core/opencl/ocl-icd_git.bb b/meta-
> oe/recipes-core/opencl/ocl-icd_git.bb
> index d14ec53e3d..a65c7618b8 100644
> --- a/meta-oe/recipes-core/opencl/ocl-icd_git.bb
> +++ b/meta-oe/recipes-core/opencl/ocl-icd_git.bb
> @@ -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"
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [oe] [meta-oe][PATCH v2] ocl-icd: Upgrade to latest
  2020-08-14  4:11 ` [oe] " Anuj Mittal
@ 2020-08-14  4:22   ` Khem Raj
  2020-08-14  4:47     ` Anuj Mittal
  0 siblings, 1 reply; 4+ messages in thread
From: Khem Raj @ 2020-08-14  4:22 UTC (permalink / raw)
  To: Anuj Mittal; +Cc: openembedded-devel

On Thu, Aug 13, 2020 at 9:12 PM Anuj Mittal <anuj.mittal@intel.com> wrote:
>
> On Wed, 2020-08-12 at 00:50 -0700, Khem Raj wrote:
> > 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.

yes they are different, for meta-oe khronos implementation is default.
>
> Thanks,
>
> Anuj
>
> >
> > [1]
> > https://github.com/OCL-dev/ocl-icd/commit/3920205736afbb67729e9c73c7b4c6fdb3fcb327#diff-7116ef0705885343c9e1b2171a06be0e
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> > v2: Fix library conflicts and license checksums
> >
> >  meta-oe/recipes-core/opencl/ocl-icd_git.bb | 10 ++++++++--
> >  1 file changed, 8 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta-oe/recipes-core/opencl/ocl-icd_git.bb b/meta-
> > oe/recipes-core/opencl/ocl-icd_git.bb
> > index d14ec53e3d..a65c7618b8 100644
> > --- a/meta-oe/recipes-core/opencl/ocl-icd_git.bb
> > +++ b/meta-oe/recipes-core/opencl/ocl-icd_git.bb
> > @@ -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"
> >
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [oe] [meta-oe][PATCH v2] ocl-icd: Upgrade to latest
  2020-08-14  4:22   ` Khem Raj
@ 2020-08-14  4:47     ` Anuj Mittal
  0 siblings, 0 replies; 4+ messages in thread
From: Anuj Mittal @ 2020-08-14  4:47 UTC (permalink / raw)
  To: raj.khem; +Cc: openembedded-devel

On Thu, 2020-08-13 at 21:22 -0700, Khem Raj wrote:
> On Thu, Aug 13, 2020 at 9:12 PM Anuj Mittal <anuj.mittal@intel.com>
> wrote:
> > On Wed, 2020-08-12 at 00:50 -0700, Khem Raj wrote:
> > > 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.
> 
> 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

> > Thanks,
> > 
> > Anuj
> > 
> > > [1]
> > > https://github.com/OCL-dev/ocl-icd/commit/3920205736afbb67729e9c73c7b4c6fdb3fcb327#diff-7116ef0705885343c9e1b2171a06be0e
> > > 
> > > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > > ---
> > > v2: Fix library conflicts and license checksums
> > > 
> > >  meta-oe/recipes-core/opencl/ocl-icd_git.bb | 10 ++++++++--
> > >  1 file changed, 8 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/meta-oe/recipes-core/opencl/ocl-icd_git.bb b/meta-
> > > oe/recipes-core/opencl/ocl-icd_git.bb
> > > index d14ec53e3d..a65c7618b8 100644
> > > --- a/meta-oe/recipes-core/opencl/ocl-icd_git.bb
> > > +++ b/meta-oe/recipes-core/opencl/ocl-icd_git.bb
> > > @@ -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"
> > > 
> > 

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-08-14  4:47 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-12  7:50 [meta-oe][PATCH v2] ocl-icd: Upgrade to latest Khem Raj
2020-08-14  4:11 ` [oe] " Anuj Mittal
2020-08-14  4:22   ` Khem Raj
2020-08-14  4:47     ` Anuj Mittal

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.