From 5e1b86c1b23a404fa2c9358e03e1b593e308730d Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 12 Jun 2020 13:43:12 +0800 Subject: opencl: move headers and loader recipe to common directory Signed-off-by: Anuj Mittal Signed-off-by: Khem Raj --- meta-oe/recipes-core/ocl-icd/ocl-icd_git.bb | 19 --------- .../opencl-headers/opencl-headers_git.bb | 17 -------- .../opencl-icd-loader/opencl-icd-loader_git.bb | 45 ---------------------- meta-oe/recipes-core/opencl/ocl-icd_git.bb | 19 +++++++++ meta-oe/recipes-core/opencl/opencl-headers_git.bb | 17 ++++++++ .../recipes-core/opencl/opencl-icd-loader_git.bb | 45 ++++++++++++++++++++++ 6 files changed, 81 insertions(+), 81 deletions(-) delete mode 100644 meta-oe/recipes-core/ocl-icd/ocl-icd_git.bb delete mode 100644 meta-oe/recipes-core/opencl-headers/opencl-headers_git.bb delete mode 100644 meta-oe/recipes-core/opencl-icd-loader/opencl-icd-loader_git.bb create mode 100644 meta-oe/recipes-core/opencl/ocl-icd_git.bb create mode 100644 meta-oe/recipes-core/opencl/opencl-headers_git.bb create mode 100644 meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb diff --git a/meta-oe/recipes-core/ocl-icd/ocl-icd_git.bb b/meta-oe/recipes-core/ocl-icd/ocl-icd_git.bb deleted file mode 100644 index d14ec53e3d..0000000000 --- a/meta-oe/recipes-core/ocl-icd/ocl-icd_git.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "OpenCL ICD library" -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" - -SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https" - -PV = "2.2.12+git${SRCPV}" -SRCREV = "af79aebe4649f30dbd711c1bf6fc661eac6e5f01" - -S = "${WORKDIR}/git" - -inherit autotools - -DEPENDS = "ruby-native" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-core/opencl-headers/opencl-headers_git.bb b/meta-oe/recipes-core/opencl-headers/opencl-headers_git.bb deleted file mode 100644 index dec1bea566..0000000000 --- a/meta-oe/recipes-core/opencl-headers/opencl-headers_git.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "OpenCL API Headers" -DESCRIPTION = "OpenCL compute API headers from Khronos Group" -LICENSE = "Khronos" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b" -SECTION = "base" - -S = "${WORKDIR}/git" -SRCREV = "40c5d226c7c0706f0176884e9b94b3886679c983" -SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install () { - install -d ${D}${includedir}/CL/ - install -m 0644 ${S}/CL/*.h ${D}${includedir}/CL -} diff --git a/meta-oe/recipes-core/opencl-icd-loader/opencl-icd-loader_git.bb b/meta-oe/recipes-core/opencl-icd-loader/opencl-icd-loader_git.bb deleted file mode 100644 index 7c49c8d552..0000000000 --- a/meta-oe/recipes-core/opencl-icd-loader/opencl-icd-loader_git.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "OpenCL ICD Loader" -DESCRIPTION = "OpenCL compute ICD Loader from Khronos Group" -LICENSE = "Khronos" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ec724732ce73269486574c718ef0c79b" -SECTION = "base" - -inherit pkgconfig cmake - -S = "${WORKDIR}/git" -SRCREV = "b342ff7b7f70a4b3f2cfc53215af8fa20adc3d86" -SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git" - -do_install () { - install -d ${D}${bindir} - install -m 0755 ${B}/bin/icd_loader_test ${D}${bindir}/ - chrpath -d ${D}${bindir}/icd_loader_test - install -d ${D}${libdir} - install -m 0644 ${B}/lib/libIcdLog.so ${D}${libdir}/ - install -m 0644 ${B}/lib/libOpenCLDriverStub.so ${D}${libdir}/ - chrpath -d ${D}${libdir}/libOpenCLDriverStub.so - install -m 0644 ${B}/lib/libOpenCL.so.1.2 ${D}${libdir}/ - cd ${D}${libdir} - ln -s libOpenCL.so.1.2 libOpenCL.so.1 - ln -s libOpenCL.so.1 libOpenCL.so -} - -PACKAGES = "opencl-icd-loader opencl-icd-loader-dev" -PACKAGES += "libicdlog libicdlog-dbg" -PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" - -FILES_${PN} = " \ - ${bindir}/icd_loader_test \ - ${libdir}/libOpenCLDriverStub.so \ - ${libdir}/libOpenCL.so.1.2 \ -" -FILES_${PN}-dev = " \ - ${libdir}/libOpenCL.so \ - ${libdir}/libOpenCL.so.1 \ -" - -FILES_libicdlog = "${libdir}/libIcdLog.so" -FILES_libicdlog-dbg = "${libdir}/.debug/libIcdLog.so" - -DEPENDS = "opencl-headers" -RDEPENDS_${PN} = "libicdlog" diff --git a/meta-oe/recipes-core/opencl/ocl-icd_git.bb b/meta-oe/recipes-core/opencl/ocl-icd_git.bb new file mode 100644 index 0000000000..d14ec53e3d --- /dev/null +++ b/meta-oe/recipes-core/opencl/ocl-icd_git.bb @@ -0,0 +1,19 @@ +SUMMARY = "OpenCL ICD library" +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" + +SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https" + +PV = "2.2.12+git${SRCPV}" +SRCREV = "af79aebe4649f30dbd711c1bf6fc661eac6e5f01" + +S = "${WORKDIR}/git" + +inherit autotools + +DEPENDS = "ruby-native" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-core/opencl/opencl-headers_git.bb b/meta-oe/recipes-core/opencl/opencl-headers_git.bb new file mode 100644 index 0000000000..dec1bea566 --- /dev/null +++ b/meta-oe/recipes-core/opencl/opencl-headers_git.bb @@ -0,0 +1,17 @@ +SUMMARY = "OpenCL API Headers" +DESCRIPTION = "OpenCL compute API headers from Khronos Group" +LICENSE = "Khronos" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b" +SECTION = "base" + +S = "${WORKDIR}/git" +SRCREV = "40c5d226c7c0706f0176884e9b94b3886679c983" +SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install () { + install -d ${D}${includedir}/CL/ + install -m 0644 ${S}/CL/*.h ${D}${includedir}/CL +} diff --git a/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb b/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb new file mode 100644 index 0000000000..7c49c8d552 --- /dev/null +++ b/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb @@ -0,0 +1,45 @@ +SUMMARY = "OpenCL ICD Loader" +DESCRIPTION = "OpenCL compute ICD Loader from Khronos Group" +LICENSE = "Khronos" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ec724732ce73269486574c718ef0c79b" +SECTION = "base" + +inherit pkgconfig cmake + +S = "${WORKDIR}/git" +SRCREV = "b342ff7b7f70a4b3f2cfc53215af8fa20adc3d86" +SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git" + +do_install () { + install -d ${D}${bindir} + install -m 0755 ${B}/bin/icd_loader_test ${D}${bindir}/ + chrpath -d ${D}${bindir}/icd_loader_test + install -d ${D}${libdir} + install -m 0644 ${B}/lib/libIcdLog.so ${D}${libdir}/ + install -m 0644 ${B}/lib/libOpenCLDriverStub.so ${D}${libdir}/ + chrpath -d ${D}${libdir}/libOpenCLDriverStub.so + install -m 0644 ${B}/lib/libOpenCL.so.1.2 ${D}${libdir}/ + cd ${D}${libdir} + ln -s libOpenCL.so.1.2 libOpenCL.so.1 + ln -s libOpenCL.so.1 libOpenCL.so +} + +PACKAGES = "opencl-icd-loader opencl-icd-loader-dev" +PACKAGES += "libicdlog libicdlog-dbg" +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" + +FILES_${PN} = " \ + ${bindir}/icd_loader_test \ + ${libdir}/libOpenCLDriverStub.so \ + ${libdir}/libOpenCL.so.1.2 \ +" +FILES_${PN}-dev = " \ + ${libdir}/libOpenCL.so \ + ${libdir}/libOpenCL.so.1 \ +" + +FILES_libicdlog = "${libdir}/libIcdLog.so" +FILES_libicdlog-dbg = "${libdir}/.debug/libIcdLog.so" + +DEPENDS = "opencl-headers" +RDEPENDS_${PN} = "libicdlog" -- cgit v1.2.3-54-g00ecf