mirror of
git://git.yoctoproject.org/meta-intel.git
synced 2025-07-19 21:09:03 +02:00
a9242002cb
Switch to using variables defined for RPM generation as it more closely aligns with how we install libraries and remove the tweak done for debian variables. Also fixes packaging issues when BASELIB is set to lib64: | 20:18:42 ERROR: openvino-inference-engine-2022.3.0-r0 do_package: QA Issue: openvino-inference-engine: Files/directories were installed but not shipped in any package: | 20:18:42 /usr/lib/python3.10/site-packages/_pyngraph.cpython-310-x86_64-linux-gnu.so | 20:18:42 /usr/lib/python3.10/site-packages/requirements.txt ... | 20:18:42 /usr/lib/python3.10/site-packages/openvino/inference_engine/ie_api.cpython-310-x86_64-linux-gnu.so | 20:18:42 /usr/lib/python3.10/site-packages/openvino/inference_engine/constants.cpython-310-x86_64-linux-gnu.so | 20:18:42 /usr/lib/python3.10/site-packages/openvino/inference_engine/__init__.py Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
112 lines
4.0 KiB
Diff
112 lines
4.0 KiB
Diff
Yocto specific tweaks to the build process:
|
|
|
|
* Install python modules to site-packages.
|
|
* Dont try to detect glibc version as that doesn't work when cross compiling.
|
|
* Use shared protobuf and gflags libs.
|
|
* Use system installed ocl headers.
|
|
* We have va.h in recipe-sysroot and having a va.h here leads to failures.
|
|
* Install sample binaries as well.
|
|
|
|
Upstream-Status: Inappropriate
|
|
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
|
|
|
|
diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake
|
|
index 62831fffab..b123bbad75 100644
|
|
--- a/cmake/developer_package/target_flags.cmake
|
|
+++ b/cmake/developer_package/target_flags.cmake
|
|
@@ -123,4 +123,4 @@ function(ov_glibc_version)
|
|
endif()
|
|
endfunction()
|
|
|
|
-ov_glibc_version()
|
|
+#ov_glibc_version()
|
|
diff --git a/samples/c/common/opencv_c_wrapper/CMakeLists.txt b/samples/c/common/opencv_c_wrapper/CMakeLists.txt
|
|
index f27e934793..da51c56cf3 100644
|
|
--- a/samples/c/common/opencv_c_wrapper/CMakeLists.txt
|
|
+++ b/samples/c/common/opencv_c_wrapper/CMakeLists.txt
|
|
@@ -32,5 +32,4 @@ endif()
|
|
install(
|
|
TARGETS ${TARGET_NAME}
|
|
RUNTIME DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL
|
|
- LIBRARY DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL
|
|
-)
|
|
+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT samples_bin)
|
|
diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
|
|
index 3a10819c47..d82262a714 100644
|
|
--- a/samples/cpp/CMakeLists.txt
|
|
+++ b/samples/cpp/CMakeLists.txt
|
|
@@ -230,9 +230,8 @@ macro(ie_add_sample)
|
|
target_link_libraries(${IE_SAMPLE_NAME} PRIVATE ${ov_link_libraries} Threads::Threads ${IE_SAMPLE_DEPENDENCIES})
|
|
|
|
install(TARGETS ${IE_SAMPLE_NAME}
|
|
- RUNTIME DESTINATION samples_bin/
|
|
- COMPONENT samples_bin
|
|
- EXCLUDE_FROM_ALL)
|
|
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
+ COMPONENT samples_bin)
|
|
|
|
# create global target with all samples / demo apps
|
|
if(NOT TARGET ie_samples)
|
|
diff --git a/samples/cpp/common/format_reader/CMakeLists.txt b/samples/cpp/common/format_reader/CMakeLists.txt
|
|
index 44d94e8a27..208edd8e4e 100644
|
|
--- a/samples/cpp/common/format_reader/CMakeLists.txt
|
|
+++ b/samples/cpp/common/format_reader/CMakeLists.txt
|
|
@@ -44,5 +44,5 @@ endif()
|
|
install(
|
|
TARGETS ${TARGET_NAME}
|
|
RUNTIME DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL
|
|
- LIBRARY DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL
|
|
+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT samples_bin
|
|
)
|
|
diff --git a/src/plugins/intel_gpu/include/va/va.h b/src/plugins/intel_gpu/include/va/va.h
|
|
deleted file mode 100644
|
|
index 5c8a5c6f6e..0000000000
|
|
--- a/src/plugins/intel_gpu/include/va/va.h
|
|
+++ /dev/null
|
|
@@ -1,6 +0,0 @@
|
|
-// Copyright (C) 2018-2022 Intel Corporation
|
|
-// SPDX-License-Identifier: Apache-2.0
|
|
-//
|
|
-
|
|
-typedef cl_uint VASurfaceID;
|
|
-typedef void* VADisplay;
|
|
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
|
|
index 98067991a7..bb19b592ee 100644
|
|
--- a/thirdparty/CMakeLists.txt
|
|
+++ b/thirdparty/CMakeLists.txt
|
|
@@ -20,7 +20,7 @@ if(ENABLE_SAMPLES OR ENABLE_TESTS)
|
|
endif()
|
|
|
|
if(ENABLE_INTEL_GPU)
|
|
- add_subdirectory(ocl)
|
|
+ #add_subdirectory(ocl)
|
|
endif()
|
|
|
|
add_subdirectory(xbyak EXCLUDE_FROM_ALL)
|
|
@@ -187,11 +187,11 @@ endif()
|
|
|
|
if(ENABLE_SAMPLES OR ENABLE_COMPILE_TOOL OR ENABLE_TESTS)
|
|
if(LINUX)
|
|
- if(OV_OS_RHEL)
|
|
- set(gflag_component nothreads_shared)
|
|
- elseif(OV_OS_DEBIAN)
|
|
- set(gflag_component nothreads_static)
|
|
- endif()
|
|
+ #if(OV_OS_RHEL)
|
|
+ set(gflag_component nothreads_shared)
|
|
+ #elseif(OV_OS_DEBIAN)
|
|
+ #set(gflag_component nothreads_static)
|
|
+ #endif()
|
|
find_package(gflags QUIET OPTIONAL_COMPONENTS ${gflag_component})
|
|
endif()
|
|
|
|
@@ -248,7 +248,7 @@ endif()
|
|
|
|
if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND)
|
|
if(ENABLE_SYSTEM_PROTOBUF)
|
|
- set(Protobuf_USE_STATIC_LIBS ON)
|
|
+ #set(Protobuf_USE_STATIC_LIBS ON)
|
|
if(CMAKE_VERBOSE_MAKEFILE)
|
|
set(Protobuf_DEBUG ON)
|
|
endif()
|