Merge pull request #271 from pohly/merge-prs

merge multiple PRs

Author: pohly

README.rst

@@ -89,8 +89,6 @@ Specify one or more target image(s)::
 
 $ docker/local-build.sh refkit-image-common
 
-.. building witout docker:
-
 Building without Docker
 =======================
 

bitbake

@@ -10,7 +10,7 @@ SRC_URI_append_class-target = " file://0001-Run-native-gbe_bin_generater-to-comp
 
 # CMake cannot digest "+" in pathes -> replace it with dots.
 PV = "1.3.1.${@ 'git${SRCPV}'.replace('+', '.')}"
-SRCREV = "6804cca263edd11fd03b2d7f5b7ba034d9a013c3"
+SRCREV = "757ccf02d6eac0f0281f2feb08a8bf1be6c27dfe"
 S = "${WORKDIR}/git"
 
 # we need to depend on ocl-icd, so that the exported symbols go right

meta-intel

@@ -1,4 +1,4 @@
-From e7b7f468df7c73187dcf30e02137a70ed3fe44f2 Mon Sep 17 00:00:00 2001
+From 8a0f84a7f725b0f8161661dcf1c69f047b224b74 Mon Sep 17 00:00:00 2001
 From: Ismo Puustinen <ismo.puustinen@intel.com>
 Date: Mon, 20 Feb 2017 23:21:48 +0200
 Subject: [PATCH] api: mark platform not supported if device is not found.
@@ -20,7 +20,7 @@ Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>
  2 files changed, 78 insertions(+)
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 77a1c87..0a67acd 100644
+index ecb98b96..2b38df68 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -7,6 +7,11 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
@@ -36,7 +36,7 @@ index 77a1c87..0a67acd 100644
  foreach (KF ${KERNEL_FILES})
    set (input_file ${KERNEL_SOURCE}/${KF}.cl)
 diff --git a/src/cl_api_platform_id.c b/src/cl_api_platform_id.c
-index 10d8894..1045e93 100644
+index 10d88947..1045e934 100644
 --- a/src/cl_api_platform_id.c
 +++ b/src/cl_api_platform_id.c
 @@ -19,6 +19,13 @@
@@ -127,5 +127,5 @@ index 10d8894..1045e93 100644
    if (platform != cl_get_platform_default()) {
      return CL_INVALID_PLATFORM;
 -- 
-2.9.3
+2.13.3
 

meta-openembedded

@@ -1,16 +1,16 @@
-From 7955c15d6f22297ae6d845eba6e89b384d0c0a7f Mon Sep 17 00:00:00 2001
+From f489c897a5ef80deb231296cd7e639763fee6ae4 Mon Sep 17 00:00:00 2001
 From: Tuomas Katila <tuomas.katila@intel.com>
 Date: Wed, 9 Nov 2016 11:16:40 +0200
 Subject: [PATCH] reduced native for 1.3.1
 
 Signed-off-by: Tuomas Katila <tuomas.katila@intel.com>
 Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>
 ---
- CMakeLists.txt | 116 ---------------------------------------------------------
- 1 file changed, 116 deletions(-)
+ CMakeLists.txt | 119 ---------------------------------------------------------
+ 1 file changed, 119 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7e01688..20c26b2 100644
+index 71e3ef7d..20c26b22 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -28,7 +28,6 @@ set (NOT_BUILD_STAND_ALONE_UTEST 1)
@@ -21,7 +21,7 @@ index 7e01688..20c26b2 100644
  INCLUDE (FindPkgConfig)
 
  SET(CMAKE_VERBOSE_MAKEFILE "false")
-@@ -112,119 +111,11 @@ ELSE(X11_FOUND)
+@@ -112,122 +111,11 @@ ELSE(X11_FOUND)
    MESSAGE(STATUS "Looking for XLib - not found")
  ENDIF(X11_FOUND)
 
@@ -124,24 +124,27 @@ index 7e01688..20c26b2 100644
 -
 -OPTION(OCLICD_COMPAT "OCL ICD compatibility mode" ON)
 -IF(OCLICD_COMPAT)
--Find_Package(OCLIcd)
--IF(OCLIcd_FOUND)
--  MESSAGE(STATUS "Looking for OCL ICD header file - found")
--  configure_file (
--    "intel-beignet.icd.in"
--    "${ICD_FILE_NAME}"
--  )
--  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION /etc/OpenCL/vendors)
--ELSE(OCLIcd_FOUND)
--  MESSAGE(STATUS "Looking for OCL ICD header file - not found")
--  MESSAGE(FATAL_ERROR "OCL ICD loader miss. If you really want to disable OCL ICD support, please run cmake with option -DOCLICD_COMPAT=0.")
--ENDIF(OCLIcd_FOUND)
+-  Find_Package(OCLIcd)
+-  IF(OCLIcd_FOUND)
+-    MESSAGE(STATUS "Looking for OCL ICD header file - found")
+-    configure_file (
+-      "intel-beignet.icd.in"
+-      "${ICD_FILE_NAME}"
+-      )
+-    IF(NOT OCL_ICD_INSTALL_PREFIX)
+-      set(OCL_ICD_INSTALL_PREFIX "/etc/OpenCL/vendors")
+-    ENDIF(NOT OCL_ICD_INSTALL_PREFIX)
+-    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${OCL_ICD_INSTALL_PREFIX})
+-  ELSE(OCLIcd_FOUND)
+-    MESSAGE(STATUS "Looking for OCL ICD header file - not found")
+-    MESSAGE(FATAL_ERROR "OCL ICD loader miss. If you really want to disable OCL ICD support, please run cmake with option -DOCLICD_COMPAT=0.")
+-  ENDIF(OCLIcd_FOUND)
 -ENDIF(OCLICD_COMPAT)
 -
  Find_Package(PythonInterp)
 
  OPTION(EXPERIMENTAL_DOUBLE "Enable experimental double support" OFF)
-@@ -328,13 +219,6 @@ ENDIF(BUILD_EXAMPLES)
+@@ -331,13 +219,6 @@ ENDIF(BUILD_EXAMPLES)
 
  ADD_SUBDIRECTORY(include)
  ADD_SUBDIRECTORY(backend)
@@ -156,5 +159,5 @@ index 7e01688..20c26b2 100644
  IF(BUILD_EXAMPLES)
  ADD_SUBDIRECTORY(examples)
 -- 
-2.9.3
+2.13.3
 

meta-refkit-computervision/recipes-opencl/beignet/beignet.inc

@@ -0,0 +1,11 @@
+# Refkit has its own installer image and doesn't use initramfs-module-install-efi
+# or initramfs-module-setup-live.
+#
+# We cannot disable them easily (no PACKAGECONFIG), so here we merely
+# override the dependencies and ignore the resulting broken packages.
+#
+# Ideally these modules shouldn't even be part of the base initramfs-module (see
+# "Re: [OE-core] [PATCH 2/3] initramfs-framework: include install-efi module in recipe for installation" and
+# "Re: [OE-core] [PATCH v6 1/1] initramfs-framework: module to support boot live image").
+RDEPENDS_initramfs-module-install-efi_df-refkit-config = ""
+RDEPENDS_initramfs-module-setup-live_df-refkit-config = ""