Updated RPM packages build

ilya-lavrenov · Aug 15, 2024 · 4fe7165 · 4fe7165
1 parent 5a119fb
commit 4fe7165
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml
@@ -273,6 +273,7 @@ jobs:
           python3 -c 'from openvino import Core; Core().get_property("BATCH", "SUPPORTED_PROPERTIES")'
           python3 -c 'from openvino.frontend import FrontEndManager; assert len(FrontEndManager().get_available_front_ends()) == 7'
           benchmark_app --help
+          opt_in_out --help
           ovc --help
 
   Overall_Status:

diff --git a/cmake/features.cmake b/cmake/features.cmake
@@ -194,9 +194,6 @@ ov_dependent_option (ENABLE_SYSTEM_PROTOBUF "Enables use of system Protobuf" OFF
 ov_dependent_option (ENABLE_SYSTEM_SNAPPY "Enables use of system version of Snappy" OFF
     "ENABLE_SNAPPY_COMPRESSION" OFF)
 
-ov_dependent_option (ENABLE_PYTHON_PACKAGING "Enables packaging of Python API in APT / YUM" OFF
-    "ENABLE_PYTHON;UNIX" OFF)
-
 ov_dependent_option(ENABLE_JS "Enables JS API building" ${ENABLE_JS_DEFAULT} "NOT ANDROID;NOT EMSCRIPTEN" OFF)
 
 ov_option(ENABLE_OPENVINO_DEBUG "Enable output for OPENVINO_DEBUG statements" OFF)

diff --git a/cmake/packaging/rpm.cmake b/cmake/packaging/rpm.cmake
@@ -274,9 +274,6 @@ macro(ov_cpack_settings)
     ov_rpm_generate_conflicts("${OV_CPACK_COMP_CORE_DEV}" ${conflicting_versions})
 
     ov_rpm_add_rpmlint_suppression("${OV_CPACK_COMP_CORE_DEV}"
-        # contains samples source codes
-        "devel-file-in-non-devel-package /usr/${OV_CPACK_INCLUDEDIR}/ngraph"
-        "devel-file-in-non-devel-package /usr/${OV_CPACK_INCLUDEDIR}/ie"
         "devel-file-in-non-devel-package /usr/${OV_CPACK_INCLUDEDIR}/openvino"
         "devel-file-in-non-devel-package /usr/${OV_CPACK_RUNTIMEDIR}/libopenvino*"
         "devel-file-in-non-devel-package /usr/${OV_CPACK_RUNTIMEDIR}/pkgconfig/openvino.pc")
@@ -302,8 +299,12 @@ macro(ov_cpack_settings)
         ov_rpm_generate_conflicts(${python_component} ${conflicting_versions})
 
         ov_rpm_add_rpmlint_suppression("${python_component}"
+            # entry points
+            "no-manual-page-for-binary benchmark_app"
+            "no-manual-page-for-binary opt_in_out"
+            "no-manual-page-for-binary ovc"
             # all directories
-            "non-standard-dir-perm /usr/lib64/${pyversion}/site-packages/openvino/*"
+            "non-standard-dir-perm /usr/lib/${pyversion}/site-packages/openvino/*"
             )
     endif()
 
@@ -383,7 +384,7 @@ macro(ov_cpack_settings)
     set(CPACK_COMPONENT_OPENVINO_DESCRIPTION "Intel(R) Distribution of OpenVINO(TM) Toolkit Libraries and Development files")
     set(CPACK_RPM_OPENVINO_PACKAGE_REQUIRES "${libraries_dev_package}, ${samples_package}")
     if(ENABLE_PYTHON_PACKAGING)
-        set(CPACK_DEBIAN_OPENVINO_PACKAGE_DEPENDS "${CPACK_RPM_OPENVINO_PACKAGE_REQUIRES}, ${python_package}, ${python_samples_package}")
+        set(CPACK_RPM_OPENVINO_PACKAGE_REQUIRES "${CPACK_RPM_OPENVINO_PACKAGE_REQUIRES}, ${python_package}, ${python_samples_package}")
     endif()
     set(CPACK_RPM_OPENVINO_PACKAGE_NAME "openvino-${cpack_name_ver}")
     set(CPACK_RPM_OPENVINO_PACKAGE_ARCHITECTURE "noarch")

diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt
@@ -116,6 +116,9 @@ ov_check_init_files_alignment("${INIT_FILES_RUNTIME}")
 
 ov_option(ENABLE_PYTHON "Enables OpenVINO Python API build" ${ENABLE_PYTHON_DEFAULT})
 
+ov_dependent_option (ENABLE_PYTHON_PACKAGING "Enables packaging of Python API in APT / YUM" OFF
+    "ENABLE_PYTHON;LINUX" OFF)
+
 #
 # Check for wheel package
 #
@@ -366,7 +369,7 @@ if(ENABLE_PYTHON_PACKAGING)
     ov_cpack_add_component(${OV_CPACK_COMP_PYTHON_OPENVINO}_package_${pyversion} HIDDEN)
 
     install(DIRECTORY ${ov_python_package_prefix}/ ${telemetry_python_package_prefix}/
-            DESTINATION ${CMAKE_INSTALL_PREFIX}
+            DESTINATION .
             COMPONENT ${OV_CPACK_COMP_PYTHON_OPENVINO_PACKAGE}_${pyversion}
             ${OV_CPACK_COMP_PYTHON_OPENVINO_PACKAGE_EXCLUDE_ALL}
             USE_SOURCE_PERMISSIONS)

diff --git a/thirdparty/dependencies.cmake b/thirdparty/dependencies.cmake
@@ -543,8 +543,10 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/json/nlohmann_json
         DESTINATION ${OV_CPACK_SAMPLESDIR}/cpp/thirdparty
         COMPONENT ${OV_CPACK_COMP_CPP_SAMPLES}
         ${OV_CPACK_COMP_CPP_SAMPLES_EXCLUDE_ALL}
+        PATTERN BUILD.bazel EXCLUDE
         PATTERN ChangeLog.md EXCLUDE
         PATTERN CITATION.cff EXCLUDE
+        PATTERN .cirrus.yml EXCLUDE
         PATTERN .clang-format EXCLUDE
         PATTERN .clang-tidy EXCLUDE
         PATTERN docs EXCLUDE
@@ -554,10 +556,13 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/json/nlohmann_json
         PATTERN .lgtm.yml EXCLUDE
         PATTERN Makefile EXCLUDE
         PATTERN meson.build EXCLUDE
+        PATTERN Package.swift EXCLUDE
         PATTERN README.md EXCLUDE
         PATTERN .reuse EXCLUDE
         PATTERN tests EXCLUDE
         PATTERN tools EXCLUDE
+        PATTERN WORKSPACE.bazel EXCLUDE
+        PATTERN nlohmann_json.natvis EXCLUDE
         PATTERN wsjcpp.yml EXCLUDE)
 
 # restore state