diff --git a/0001-fix-compile-error-of-libkysdk-system.patch b/0001-fix-compile-error-of-libkysdk-system.patch index 9d3f37dacbae439fc57ca8be6601ff4f24776fc6..9036e5d7bf1232b728209d39b741d4de29e93f4a 100644 --- a/0001-fix-compile-error-of-libkysdk-system.patch +++ b/0001-fix-compile-error-of-libkysdk-system.patch @@ -1,36 +1,87 @@ -From 553b45f54f9a7c736d8edb6f702b2d9497cd03aa Mon Sep 17 00:00:00 2001 +From 8dace21341fd79420d2ab0b9f33c6e6a34949d11 Mon Sep 17 00:00:00 2001 From: peijiankang -Date: Thu, 3 Nov 2022 11:37:28 +0800 +Date: Mon, 5 Dec 2022 13:55:59 +0800 Subject: [PATCH] fix compile error of libkysdk-system --- - src/systemtime/CMakeLists.txt | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) + CMakeLists.txt | 5 +++++ + src/kdkocr/CMakeLists.txt | 4 ++++ + src/location/CMakeLists.txt | 9 +++++++++ + src/powermanagement/CMakeLists.txt | 3 ++- + src/systemtime/CMakeLists.txt | 6 ++++++ + 5 files changed, 26 insertions(+), 1 deletion(-) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7f7ea66..b34b924 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -42,3 +42,8 @@ set (LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) + set (EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) + + add_subdirectory(src) ++ ++install(FILES development-files/kysdk-disk.pc development-files/kysdk-filesystem.pc development-files/kysdk-hardware.pc development-files/kysdk-location.pc development-files/kysdk-net.pc development-files/kysdk-ocr.pc development-files/kysdk-package.pc development-files/kysdk-powermanagement.pc development-files/kysdk-proc.pc development-files/kysdk-realtime.pc development-files/kysdk-sysinfo.pc development-files/kysdk-system.pc ++ DESTINATION /usr/share/kgconfig/) ++install(FILES development-files/kysdk-system.conf ++ DESTINATION /etc/ld.so.conf.d/) +diff --git a/src/kdkocr/CMakeLists.txt b/src/kdkocr/CMakeLists.txt +index e8337a9..8922292 100644 +--- a/src/kdkocr/CMakeLists.txt ++++ b/src/kdkocr/CMakeLists.txt +@@ -206,6 +206,10 @@ set_target_properties(kyocr PROPERTIES VERSION 2.0.0 SOVERSION 1) + + install(TARGETS kyocr LIBRARY DESTINATION lib/kysdk/kysdk-system) + install(FILES ${PROJECT_SOURCE_DIR}/libkyocr.hpp DESTINATION include/kysdk/kysdk-system) ++install(FILES models/cls/inference.pdiparams models/cls/inference.pdiparams.info models/cls/inference.pdmodel DESTINATION /etc/kdkocr/cls) ++install(FILES models/det/inference.pdiparams models/det/inference.pdiparams.info models/det/inference.pdmodel DESTINATION /etc/kdkocr/det) ++install(FILES models/ppocr_keys_v1.txt DESTINATION /etc/kdkocr/) ++install(FILES models/rec/inference.pdiparams models/rec/inference.pdiparams.info models/rec/inference.pdmodel DESTINATION /etc/kdkocr/rec) + + if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libs/amd64/paddle_inference/paddle/lib/libpaddle_inference.so") + install(FILES ${PROJECT_SOURCE_DIR}/libs/libpaddle_inference DESTINATION lib/libpaddle_inference.so) +diff --git a/src/location/CMakeLists.txt b/src/location/CMakeLists.txt +index 05ff2e9..ec4f452 100644 +--- a/src/location/CMakeLists.txt ++++ b/src/location/CMakeLists.txt +@@ -11,3 +11,12 @@ install(TARGETS kylocation + + install(FILES libkylocation.h + DESTINATION include/kysdk/kysdk-system) ++ ++install(FILES location.py ++ DESTINATION bin) ++ ++install(FILES dbus_location.conf ++ DESTINATION /etc/dbus-1/system.d/) ++ ++install(FILES dbus_location.service ++ DESTINATION /lib/systemd/system/) +diff --git a/src/powermanagement/CMakeLists.txt b/src/powermanagement/CMakeLists.txt +index aa318d2..afa969d 100644 +--- a/src/powermanagement/CMakeLists.txt ++++ b/src/powermanagement/CMakeLists.txt +@@ -28,4 +28,5 @@ set(SRCS + target_include_directories(${PROJECT_NAME} PRIVATE ${POWERMANAGEMENT_TOP_DIR}) + target_sources(${PROJECT_NAME} PRIVATE ${SRCS}) + +-install(TARGETS ${PROJECT_NAME} DESTINATION lib/kysdk/kysdk-system) +\ No newline at end of file ++install(TARGETS ${PROJECT_NAME} DESTINATION lib/kysdk/kysdk-system) ++install(FILES libkylockscreen.h DESTINATION include/kysdk/kysdk-system/) diff --git a/src/systemtime/CMakeLists.txt b/src/systemtime/CMakeLists.txt -index 69c3a44..c2696eb 100644 +index 69c3a44..a492efa 100644 --- a/src/systemtime/CMakeLists.txt +++ b/src/systemtime/CMakeLists.txt -@@ -13,7 +13,18 @@ find_library(DBUS_LIB dbus-1) - find_library(DBUS_GLIB_LIB dbus-glib-1) - find_library(THREAD_LIB pthread) - link_directories(/usr/lib/kysdk/kysdk-base/) --include_directories(${PKGS_INCLUDE_DIRS}) -+include_directories(${PKGS_INCLUDE_DIRS} /usr/include/kysdk/kysdk-base) +@@ -17,3 +17,9 @@ include_directories(${PKGS_INCLUDE_DIRS}) # SET( EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) ADD_EXECUTABLE(systime m_systime.c) target_link_libraries(systime ${GLIBC_LIB} ${DBUS_LIB} ${DBUS_GLIB_LIB} ${THREAD_LIB} ${TIMER_LIST_C} kytimer kylog kyconf) + -+install(TARGETS systime -+ DESTINATION /usr/bin) -+install(FILES com.kylin.kysdk.TimeServer.conf -+ DESTINATION /etc/dbus-1/system.d/) -+install(FILES kysdk-systime.service -+ DESTINATION /lib/systemd/system/) -+install(FILES m_systime.h -+ DESTINATION /usr/include/kysdk/kysdk-system) -+ ++install(TARGETS systime DESTINATION /usr/bin) ++install(FILES com.kylin.kysdk.TimeServer.conf DESTINATION /etc/dbus-1/system.d/) ++install(FILES kysdk-systime.service DESTINATION /lib/systemd/system/) ++install(FILES m_systime.h DESTINATION /usr/include/kysdk/kysdk-system) + -- -2.36.1 +2.33.0 diff --git a/libkysdk-system-1.0.0.tar.gz b/libkysdk-system-1.0.0.tar.gz deleted file mode 100644 index 9477155d094f3fee2e9e0d6b9208d8f7c7731b22..0000000000000000000000000000000000000000 Binary files a/libkysdk-system-1.0.0.tar.gz and /dev/null differ diff --git a/libkysdk-system-2.0.0.tar.gz b/libkysdk-system-2.0.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..009312dd995fdc2d123ec7a8ef90c75f7e24d2b0 Binary files /dev/null and b/libkysdk-system-2.0.0.tar.gz differ diff --git a/libkysdk-system.spec b/libkysdk-system.spec index e583837dc45e5438e5c4d1620cad6ce529c00909..7c785b8cd2e3f1c74941cec70f2f72b669983e36 100644 --- a/libkysdk-system.spec +++ b/libkysdk-system.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: libkysdk-system -Version: 1.0.0 +Version: 2.0.0 Release: 1 Summary: Kylin Software Development Kit - System Layer Kit License: GPL-2+ @@ -12,6 +12,7 @@ Patch01: 0001-fix-compile-error-of-libkysdk-system.patch BuildRequires: cmake BuildRequires: glibc-devel BuildRequires: systemd-devel +BuildRequires: cjson-devel BuildRequires: dbus-devel BuildRequires: dbus-glib-devel BuildRequires: glib2-devel @@ -19,11 +20,16 @@ BuildRequires: libkysdk-log-devel BuildRequires: libkysdk-config-devel BuildRequires: libkysdk-utils-devel BuildRequires: libkysdk-timer-devel -#compile need but control is not exist -BuildRequires: gcc-c++ +BuildRequires: qt5-qtbase-devel +BuildRequires: opencv +BuildRequires: libarchive-devel +BuildRequires: tesseract-devel +BuildRequires: cups-devel +BuildRequires: libcurl-devel +BuildRequires: libXrandr-devel -Requires: libkysdk-disk libkysdk-sysinfo libkysdk-systime +Requires: libkysdk-disk libkysdk-sysinfo libkysdk-systime libkysdk-filesystem libkysdk-proc libkysdk-hardware libkysdk-package libkysdk-powermanagement systemd glib2 libkysdk-systemcommon libkysdk-location libkysdk-net libkysdk-realtime %description Kylin Software Development Kit - System Layer Kit @@ -31,66 +37,218 @@ Provides APIs and services such as system information, disk information, and sys %package -n libkysdk-system-devel -Summary: utils -Requires: libkysdk-system, libkysdk-disk-devel, libkysdk-sysinfo-devel, libkysdk-systime-devel, libkysdk-sysinfo-devel +Summary: libkysdk-system Development libraries, Provides APIs and services such as system information, disk information, and system time +Requires: libkysdk-system libkysdk-disk-devel libkysdk-sysinfo-devel libkysdk-systime-devel libkysdk-filesystem-devel libkysdk-proc-devel libkysdk-hardware-devel libkysdk-package-devel libkysdk-powermanagement-devel libkysdk-location-devel libkysdk-net-devel libkysdk-realtime-devel %description -n libkysdk-system-devel -libkysdk-system Development libraries, Provides APIs and services such as system information, disk information, and system time +%{summary}. %package -n libkysdk-disk -Summary: utils -Requires: libkysdk-log +Summary: System disk information acquisition library +Requires: libkysdk-log libkysdk-systemcommon %description -n libkysdk-disk -System disk information acquisition library +%{summary}. %package -n libkysdk-disk-devel -Summary: utils -Requires: libkysdk-disk, libkysdk-log-devel, libkysdk-utils-devel, libudev-devel +Summary: System disk information acquisition library - Development libraries +Requires: libkysdk-disk libkysdk-log-devel libkysdk-utils-devel util-linux-devel systemd-devel %description -n libkysdk-disk-devel -System disk information acquisition library - Development libraries +%{summary}. %package -n libkysdk-systime -Summary: utils -Requires: libkysdk-log, dbus, systemd, libkysdk-timer +Summary: Library of system time-related operations +Requires: libkysdk-log dbus systemd libkysdk-timer glib2 libkysdk-timer libkysdk-systemcommon %description -n libkysdk-systime -Library of system time-related operations +%{summary}. %package -n libkysdk-systime-devel -Summary: utils -Requires: libkysdk-systime, libkysdk-timer-devel +Summary: Library of system time-related operations - Development libraries +Requires: libkysdk-systime glib2-devel libkysdk-timer-devel %description -n libkysdk-systime-devel -Library of system time-related operations - Development libraries +%{summary}. %package -n libkysdk-sysinfo -Summary: utils -Requires: libkysdk-log +Summary: System Information Acquisition Library +Requires: libkysdk-log dbus glib2 systemd cjson libXrandr libkysdk-systemcommon %description -n libkysdk-sysinfo -System Information Acquisition Library +%{summary}. %package -n libkysdk-sysinfo-devel -Summary: utils -Requires: libkysdk-sysinfo, libkysdk-log-devel, libkysdk-utils-devel +Summary: System Information Acquisition Library - Development libraries +Requires: libkysdk-sysinfo libkysdk-log-devel libkysdk-utils-devel systemd-devel cjson-devel dbus-devel dbus-glib-devel glib2-devel libXrandr-devel %description -n libkysdk-sysinfo-devel -System Information Acquisition Library - Development libraries +%{summary}. + + +%package -n libkysdk-filesystem +Summary: File System Library +Requires: libkysdk-log qt5-qtbase libkysdk-config systemd libkysdk-systemcommon + +%description -n libkysdk-filesystem +%{summary}. + + +%package -n libkysdk-filesystem-devel +Summary: File System Library - Development libraries +Requires: libkysdk-filesystem libkysdk-log-devel libkysdk-config-devel systemd-devel qt5-qtbase-devel + +%description -n libkysdk-filesystem-devel +%{summary}. + + +%package -n libkysdk-hardware +Summary: Hardware information acquisition library +Requires: libkysdk-log libkysdk-config systemd libkysdk-systemcommon cups-libs libcurl systemd + +%description -n libkysdk-hardware +%{summary}. + + +%package -n libkysdk-hardware-devel +Summary: Hardware information acquisition library - Development libraries +Requires: libkysdk-hardware libkysdk-log-devel libkysdk-config-devel systemd-devel cups-devel libcurl-devel systemd-devel + +%description -n libkysdk-hardware-devel +%{summary}. + + +%package -n libkysdk-package +Summary: Package Management Library +Requires: libkysdk-systemcommon + +%description -n libkysdk-package +%{summary}. + + +%package -n libkysdk-package-devel +Summary: Package Management Library - Development libraries +Requires: libkysdk-package + +%description -n libkysdk-package-devel +%{summary}. + + +%package -n libkysdk-proc +Summary: Runtime information retrieval library +Requires: libkysdk-systemcommon + +%description -n libkysdk-proc +%{summary}. + + +%package -n libkysdk-proc-devel +Summary: Runtime information retrieval library - Development libraries +Requires: libkysdk-proc + +%description -n libkysdk-proc-devel +%{summary}. + + +%package -n libkysdk-powermanagement +Summary: Power management library +Requires: libkysdk-log libkysdk-systemcommon + +%description -n libkysdk-powermanagement +%{summary}. + + +%package -n libkysdk-powermanagement-devel +Summary: Power management library - Development libraries +Requires: libkysdk-log-devel libkysdk-powermanagement + +%description -n libkysdk-powermanagement-devel +%{summary}. + + +%package -n libkysdk-ocr +Summary: AI character recognition function +Requires: opencv leptonica libarchive tesseract libkysdk-systemcommon + +%description -n libkysdk-ocr +%{summary}. + + +%package -n libkysdk-ocr-devel +Summary: AI character recognition function - Development libraries +Requires: libkysdk-ocr leptonica-devel libopencv-devel libarchive-devel tesseract-devel + +%description -n libkysdk-ocr-devel +%{summary}. + + +%package -n libkysdk-systemcommon +Summary: Kysdk system layer common data package + +%description -n libkysdk-systemcommon +%{summary}. + + +%package -n libkysdk-location +Summary: Geographic Location Library +Requires: libkysdk-systemcommon glib2 + +%description -n libkysdk-location +%{summary}. + + +%package -n libkysdk-location-devel +Summary: Geographic Location Library - Development libraries +Requires: libkysdk-location + +%description -n libkysdk-location-devel +%{summary}. + + +%package -n libkysdk-net +Summary: Network information base +Requires: libkysdk-systemcommon + +%description -n libkysdk-net +%{summary}. + + +%package -n libkysdk-net-devel +Summary: Network information base - Development libraries +Requires: libkysdk-net + +%description -n libkysdk-net-devel +%{summary}. + + +%package -n libkysdk-realtime +Summary: Runtime repository +Requires: libkysdk-systemcommon + +%description -n libkysdk-realtime +%{summary}. + + +%package -n libkysdk-realtime-devel +Summary: Runtime repository - Development libraries +Requires: libkysdk-realtime + +%description -n libkysdk-realtime-devel +%{summary}. + %prep %setup -q %patch01 -p1 %build -pushd build +mkdir build && pushd build cmake .. make -j4 popd @@ -103,20 +261,35 @@ popd %clean rm -rf $RPM_BUILD_ROOT + %post -systemctl daemon-reload -systemctl enable kysdk-systime.service -systemctl restart kysdk-systime.service +check_env=`systemd-detect-virt` +echo $check_env +if [ $check_env = "docker" ];then + echo "docker env do not start kysdk-systime.service" +else + systemctl daemon-reload + systemctl enable kysdk-systime.service + systemctl restart kysdk-systime.service +fi + +if [ -f "/usr/lib/libpaddle_inference.so/libpaddle_inference" ] +then + rm -rf /usr/lib/libpaddle_inference.so/ +fi + %files %files -n libkysdk-system-devel +%{_datadir}/kgconfig/kysdk-system.pc %files -n libkysdk-disk -%{_prefix}/lib/kysdk/kysdk-system/libkydiskinfo.so +%{_prefix}/lib/kysdk/kysdk-system/libkydiskinfo.so* %files -n libkysdk-disk-devel %{_includedir}/kysdk/kysdk-system/libkydiskinfo.h +%{_datadir}/kgconfig/kysdk-disk.pc %files -n libkysdk-systime %{_bindir}/systime @@ -127,11 +300,95 @@ systemctl restart kysdk-systime.service %{_includedir}/kysdk/kysdk-system/m_systime.h %files -n libkysdk-sysinfo -%{_prefix}/lib/kysdk/kysdk-system/libkysysinfo.so +%{_prefix}/lib/kysdk/kysdk-system/libkysysinfo.so* %files -n libkysdk-sysinfo-devel %{_includedir}/kysdk/kysdk-system/libkysysinfo.hpp +%{_includedir}/kysdk/kysdk-system/libkysysinfo.h +%{_datadir}/kgconfig/kysdk-sysinfo.pc + +%files -n libkysdk-filesystem +%{_prefix}/lib/kysdk/kysdk-system/libkyfilewatcher.so* + +%files -n libkysdk-filesystem-devel +%{_includedir}/kysdk/kysdk-system/libkyfilewatcher.hpp +%{_includedir}/kysdk/kysdk-system/libkyfilewatcher_global.hpp +%{_datadir}/kgconfig/kysdk-filesystem.pc + +%files -n libkysdk-hardware +%{_prefix}/lib/kysdk/kysdk-system/libkyhw.so* + +%files -n libkysdk-hardware-devel +%{_includedir}/kysdk/kysdk-system/libkync.h +%{_includedir}/kysdk/kysdk-system/libkycpu.h +%{_includedir}/kysdk/kysdk-system/libkyprinter.h +%{_includedir}/kysdk/kysdk-system/libkybios.h +%{_includedir}/kysdk/kysdk-system/libkyboard.h +%{_includedir}/kysdk/kysdk-system/libkyusb.h +%{_datadir}/kgconfig/kysdk-hardware.pc + +%files -n libkysdk-package +%{_prefix}/lib/kysdk/kysdk-system/libkypackage.so* + +%files -n libkysdk-package-devel +%{_includedir}/kysdk/kysdk-system/libkypackages.h +%{_datadir}/kgconfig/kysdk-package.pc + +%files -n libkysdk-proc +%{_prefix}/lib/kysdk/kysdk-system/libkyrtinfo.so* + +%files -n libkysdk-proc-devel +%{_includedir}/kysdk/kysdk-system/libkyrtinfo.h +%{_includedir}/kysdk/kysdk-system/libkyprocess.h +%{_datadir}/kgconfig/kysdk-proc.pc + +%files -n libkysdk-powermanagement +%{_prefix}/lib/kysdk/kysdk-system/libkypowermanagement.so* + +%files -n libkysdk-powermanagement-devel +%{_includedir}/kysdk/kysdk-system/libkylockscreen.h +%{_datadir}/kgconfig/kysdk-powermanagement.pc + +%files -n libkysdk-ocr +%{_prefix}/lib/kysdk/kysdk-system/libkyocr.so* +%{_prefix}/lib/libpaddle_inference.so +%{_sysconfdir}/kdkocr/* + +%files -n libkysdk-ocr-devel +%{_includedir}/kysdk/kysdk-system/libkyocr.hpp +%{_datadir}/kgconfig/kysdk-ocr.pc + +%files -n libkysdk-systemcommon +%{_sysconfdir}/ld.so.conf.d/kysdk-system.conf + +%files -n libkysdk-location +%{_prefix}/lib/kysdk/kysdk-system/libkylocation.so* +%{_bindir}/location.py +%{_sysconfdir}/dbus-1/system.d/dbus_location.conf +/lib/systemd/system/dbus_location.service + +%files -n libkysdk-location-devel +%{_includedir}/kysdk/kysdk-system/libkylocation.h +%{_datadir}/kgconfig/kysdk-location.pc + +%files -n libkysdk-net +%{_prefix}/lib/kysdk/kysdk-system/libkynetinfo.so* + +%files -n libkysdk-net-devel +%{_includedir}/kysdk/kysdk-system/libkynetinfo.h +%{_datadir}/kgconfig/kysdk-net.pc + +%files -n libkysdk-realtime +%{_prefix}/lib/kysdk/kysdk-system/libkyrealtime.so* + +%files -n libkysdk-realtime-devel +%{_includedir}/kysdk/kysdk-system/libkyrealtimeinfo.h +%{_datadir}/kgconfig/kysdk-realtime.pc + %changelog +* Mon Dec 5 2022 peijiankang - 2.0.0-1 +- update version to 2.0.0 + * Thu Nov 3 2022 peijiankang - 1.0.0-1 - Init Package for libkysdk-system