diff --git a/debian/control b/debian/control index fb4bc58..5c66a80 100644 --- a/debian/control +++ b/debian/control @@ -38,7 +38,8 @@ Depends: ${shlibs:Depends}, libkysdk-powermanagement, systemd, libkylin-activation, - libglib2.0-0 + libglib2.0-0, + libkysdk-systemcommon Multi-Arch: same Description: 麒麟开发者套件 - 系统层套件，提供系统信息、磁盘信息、系统时间等API与服务 @@ -65,7 +66,8 @@ Architecture: any Section: utils Depends: ${shlibs:Depends}, ${misc:Depends}, - libkysdk-log + libkysdk-log, + libkysdk-systemcommon Multi-Arch: same Description: 系统磁盘信息获取库 @@ -91,7 +93,8 @@ Depends: ${shlibs:Depends}, dbus, systemd, libglib2.0-0, - libkysdk-timer + libkysdk-timer, + libkysdk-systemcommon Multi-Arch: same Description: 系统时间相关操作库 @@ -115,7 +118,8 @@ Depends: ${shlibs:Depends}, dbus, libkylin-activation, libglib2.0-0, - systemd + systemd, + libkysdk-systemcommon Multi-Arch: same Description: 系统信息获取库 @@ -143,7 +147,8 @@ Depends: ${shlibs:Depends}, libkysdk-log, libqt5core5a, libkysdk-config, - systemd + systemd, + libkysdk-systemcommon Multi-Arch: same Description: 文件系统库 @@ -167,7 +172,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libkysdk-log, libkysdk-config, - systemd + systemd, + libkysdk-systemcommon Multi-Arch: same Description: 硬件信息获取库 @@ -187,7 +193,8 @@ Package: libkysdk-package Architecture: any Section: utils Depends: ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, + libkysdk-systemcommon Multi-Arch: same Description: 包管理库 @@ -204,7 +211,8 @@ Package: libkysdk-proc Architecture: any Section: utils Depends: ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, + libkysdk-systemcommon Multi-Arch: same Description: 运行时信息获取库 @@ -222,7 +230,8 @@ Architecture: any Section: utils Depends: ${shlibs:Depends}, ${misc:Depends}, - libkysdk-log + libkysdk-log, + libkysdk-systemcommon Multi-Arch: same Description: 电源管理库 @@ -248,10 +257,19 @@ Depends: ${shlibs:Depends}, liblept5, libarchive13, libtesseract4, + libkysdk-systemcommon Description: AI文字识别功能 Package: libkysdk-ocr-dev Architecture: amd64 arm64 mips64el loongarch64 Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends},libkysdk-ocr,libleptonica-dev,libopencv-dev,libarchive-dev,libtesseract-dev -Description: AI文字识别功能-开发库 \ No newline at end of file +Description: AI文字识别功能-开发库 + +Package: libkysdk-systemcommon +Architecture: any +Section: utils +Depends: ${shlibs:Depends}, + ${misc:Depends} +Multi-Arch: same +Description: kysdk-system层公用数据包 diff --git a/debian/libkysdk-disk.install b/debian/libkysdk-disk.install index 1b5a776..5a945ae 100644 --- a/debian/libkysdk-disk.install +++ b/debian/libkysdk-disk.install @@ -1 +1 @@ -usr/lib/kysdk/kysdk-system/libkydiskinfo.so \ No newline at end of file + usr/lib/kysdk/kysdk-system/libkydiskinfo.so* \ No newline at end of file diff --git a/debian/libkysdk-filesystem.install b/debian/libkysdk-filesystem.install index 1d46ba4..f0f7fe0 100644 --- a/debian/libkysdk-filesystem.install +++ b/debian/libkysdk-filesystem.install @@ -1 +1 @@ -usr/lib/kysdk/kysdk-system/libkyfilewatcher.so +usr/lib/kysdk/kysdk-system/libkyfilewatcher.so* diff --git a/debian/libkysdk-hardware.install b/debian/libkysdk-hardware.install index 7840570..9d1e99b 100644 --- a/debian/libkysdk-hardware.install +++ b/debian/libkysdk-hardware.install @@ -1 +1 @@ -usr/lib/kysdk/kysdk-system/libkyhw.so +usr/lib/kysdk/kysdk-system/libkyhw.so* diff --git a/debian/libkysdk-ocr.install b/debian/libkysdk-ocr.install index afd4b98..87f62ac 100644 --- a/debian/libkysdk-ocr.install +++ b/debian/libkysdk-ocr.install @@ -1,3 +1,3 @@ -usr/lib/kysdk/kysdk-system/libkyocr.so +usr/lib/kysdk/kysdk-system/libkyocr.so* usr/lib/libpaddle_inference.so src/kdkocr/models/* /etc/kdkocr/ \ No newline at end of file diff --git a/debian/libkysdk-package.install b/debian/libkysdk-package.install index 13c97df..9ff0aa9 100644 --- a/debian/libkysdk-package.install +++ b/debian/libkysdk-package.install @@ -1 +1 @@ -usr/lib/kysdk/kysdk-system/libkypackage.so +usr/lib/kysdk/kysdk-system/libkypackage.so* diff --git a/debian/libkysdk-powermanagement.install b/debian/libkysdk-powermanagement.install index 93a56e2..28e5784 100644 --- a/debian/libkysdk-powermanagement.install +++ b/debian/libkysdk-powermanagement.install @@ -1 +1 @@ -usr/lib/kysdk/kysdk-system/libkypowermanagement.so \ No newline at end of file +usr/lib/kysdk/kysdk-system/libkypowermanagement.so* \ No newline at end of file diff --git a/debian/libkysdk-proc.install b/debian/libkysdk-proc.install index b545a2f..8b463f6 100644 --- a/debian/libkysdk-proc.install +++ b/debian/libkysdk-proc.install @@ -1 +1 @@ -usr/lib/kysdk/kysdk-system/libkyrtinfo.so +usr/lib/kysdk/kysdk-system/libkyrtinfo.so* diff --git a/debian/libkysdk-sysinfo.install b/debian/libkysdk-sysinfo.install index 3adef06..ad82133 100644 --- a/debian/libkysdk-sysinfo.install +++ b/debian/libkysdk-sysinfo.install @@ -1 +1 @@ -usr/lib/kysdk/kysdk-system/libkysysinfo.so \ No newline at end of file +usr/lib/kysdk/kysdk-system/libkysysinfo.so* \ No newline at end of file diff --git a/debian/libkysdk-systemcommon.install b/debian/libkysdk-systemcommon.install new file mode 100644 index 0000000..ba43954 --- /dev/null +++ b/debian/libkysdk-systemcommon.install @@ -0,0 +1 @@ +development-files/kysdk-system.conf etc/ld.so.conf.d \ No newline at end of file diff --git a/development-files/kysdk-system.conf b/development-files/kysdk-system.conf new file mode 100644 index 0000000..e8dc3be --- /dev/null +++ b/development-files/kysdk-system.conf @@ -0,0 +1 @@ +/usr/lib/kysdk/kysdk-system \ No newline at end of file diff --git a/src/disk/CMakeLists.txt b/src/disk/CMakeLists.txt index 38661f7..2663b7e 100644 --- a/src/disk/CMakeLists.txt +++ b/src/disk/CMakeLists.txt @@ -1,5 +1,6 @@ aux_source_directory(. SOURCESCODE) add_library(kydiskinfo SHARED ${SOURCESCODE}) +set_target_properties(kydiskinfo PROPERTIES VERSION 1.2.0 SOVERSION 1) add_executable(test-getdiskinfo test/getdiskinfo.c) add_executable(test-getdisklist test/getdisklist.c) find_library(UDEV_LIB udev) diff --git a/src/filesystem/filewatcher/CMakeLists.txt b/src/filesystem/filewatcher/CMakeLists.txt index d5bc184..4f23d76 100644 --- a/src/filesystem/filewatcher/CMakeLists.txt +++ b/src/filesystem/filewatcher/CMakeLists.txt @@ -5,6 +5,7 @@ aux_source_directory(. SOURCECODE) find_package(Qt5Core) include_directories(${Qt5Core_INCLUDE_DIRS}) add_library(kyfilewatcher SHARED ${SOURCECODE}) +set_target_properties(kyfilewatcher PROPERTIES VERSION 1.2.0 SOVERSION 1) add_executable(kyfilewatcher-test test/kyfilewatcher-test.cpp) target_link_libraries(kyfilewatcher kylog kyconf systemd pthread ${Qt5Core_LIBRARIES}) target_link_libraries(kyfilewatcher-test kyfilewatcher) diff --git a/src/hardware/CMakeLists.txt b/src/hardware/CMakeLists.txt index ccb9831..916423f 100644 --- a/src/hardware/CMakeLists.txt +++ b/src/hardware/CMakeLists.txt @@ -1,6 +1,7 @@ aux_source_directory(. SOURCESCODE) include_directories(.) add_library(kyhw SHARED ${SOURCESCODE}) +set_target_properties(kyhw PROPERTIES VERSION 1.2.0 SOVERSION 1) add_executable(kync-test test/kync-test.c) add_executable(kycpu-test test/kycpu-test.c) target_link_libraries(kyhw kylog kyconf pthread systemd) diff --git a/src/kdkocr/CMakeLists.txt b/src/kdkocr/CMakeLists.txt index 5a2c516..a3ee095 100644 --- a/src/kdkocr/CMakeLists.txt +++ b/src/kdkocr/CMakeLists.txt @@ -168,6 +168,7 @@ if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "loongarch64") else() add_library(kyocr SHARED libkyocr.cpp ocr_main.cpp utility.cpp preprocess_op.cpp postprocess_op.cpp) endif() +set_target_properties(kyocr PROPERTIES VERSION 1.2.0 SOVERSION 1) #target_link_libraries(kdkOCR -lleptonica) target_link_libraries(kyocr ${OpenCV_LIBS} ${DEPS}) target_link_libraries(kyocr ${kyocr_libraries}) diff --git a/src/packages/CMakeLists.txt b/src/packages/CMakeLists.txt index 0ab21e2..1225379 100644 --- a/src/packages/CMakeLists.txt +++ b/src/packages/CMakeLists.txt @@ -1,6 +1,7 @@ aux_source_directory(. SOURCESCODE) include_directories(.) add_library(kypackage SHARED ${SOURCESCODE}) +set_target_properties(kypackage PROPERTIES VERSION 1.2.0 SOVERSION 1) add_executable(kypackage-test test/kypackage-test.c) target_link_libraries(kypackage-test kypackage) diff --git a/src/powermanagement/CMakeLists.txt b/src/powermanagement/CMakeLists.txt index 282681d..7a495fc 100644 --- a/src/powermanagement/CMakeLists.txt +++ b/src/powermanagement/CMakeLists.txt @@ -5,6 +5,7 @@ project(kypowermanagement LANGUAGES CXX) set(POWERMANAGEMENT_TOP_DIR ${CMAKE_CURRENT_LIST_DIR}) add_library(${PROJECT_NAME} SHARED) +set_target_properties(kypowermanagement PROPERTIES VERSION 1.2.0 SOVERSION 1) target_compile_options(${PROJECT_NAME} PRIVATE -Wall -g) target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11) diff --git a/src/proc/CMakeLists.txt b/src/proc/CMakeLists.txt index 322fcf6..5833e23 100644 --- a/src/proc/CMakeLists.txt +++ b/src/proc/CMakeLists.txt @@ -1,6 +1,7 @@ aux_source_directory(. SOURCESCODE) include_directories(.) add_library(kyrtinfo SHARED ${SOURCESCODE}) +set_target_properties(kyrtinfo PROPERTIES VERSION 1.2.0 SOVERSION 1) add_executable(kyrtinfo-test test/kyrtinfo-test.c) target_link_libraries(kyrtinfo-test kyrtinfo) diff --git a/src/systeminfo/CMakeLists.txt b/src/systeminfo/CMakeLists.txt index e98851b..94d692b 100644 --- a/src/systeminfo/CMakeLists.txt +++ b/src/systeminfo/CMakeLists.txt @@ -4,6 +4,7 @@ find_library(GLIBC_LIB glib-2.0) find_library(DBUS_LIB dbus-1) find_library(DBUS_GLIB_LIB dbus-glib-1) add_library(kysysinfo SHARED ${SOURCESCODE}) +set_target_properties(kysysinfo PROPERTIES VERSION 1.2.0 SOVERSION 1) add_executable(kysysinfo-test test/kysysinfo_test.c) target_link_libraries(kysysinfo kylin-activation kylog systemd kyconf ${GLIBC_LIB} ${DBUS_LIB} ${DBUS_GLIB_LIB}) target_link_libraries(kysysinfo-test kysysinfo)