openkylin
/
libkysdk-system
mirror of https://gitee.com/openkylin/libkysdk-system.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

同步主线，其他修改：修复打印和usb部分因为拆分动态库导致的兼容性问题

This commit is contained in:
shaozhimin 2023-10-11 10:23:38 +08:00
parent 92ce72fe8a
commit 168a6b53c2
7 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
libkysdk-system (2.2.3.5-0k0.16) yangtze; urgency=medium
*Bug号：
*需求号：
*其他修改：修复打印和usb部分因为拆分动态库导致的兼容性问题
-- szm-min <shaozhimin@kylinos.cn> Wed, 11 Oct 2023 09:43:29 +0800
libkysdk-system (2.2.3.5-0k0.15) yangtze; urgency=medium
*Bug号：

2
debian/libkysdk-hardware.install vendored
View File

@ -3,5 +3,3 @@ usr/lib/kysdk/kysdk-system/libkybluetooth.so*
usr/lib/kysdk/kysdk-system/libkyedid.so*
usr/lib/kysdk/kysdk-system/libkyfan.so*
usr/lib/kysdk/kysdk-system/libkyhwinfo.so*
usr/lib/kysdk/kysdk-system/libkyprinter.so*
usr/lib/kysdk/kysdk-system/libkyusb.so*

2
development-files/kysdk-hardware.pc
View File

@ -2,5 +2,5 @@ Name: libkysdk-hardware
Description: kysdk system layer hardware component
Requires: kysdk-log kysdk-config libsystemd libudev
Version: 2.0.0
Libs: -L/usr/lib/kysdk/kysdk-system/ -L/usr/lib/kysdk/kysdk-base -lkyhw -Wl,-rpath=/usr/lib/kysdk/kysdk-system/
Libs: -L/usr/lib/kysdk/kysdk-system/ -L/usr/lib/kysdk/kysdk-base -lkyhw -lkybluetooth -lkyedid -lkyfan -lkyhwinfo -Wl,-rpath=/usr/lib/kysdk/kysdk-system/
Cflags: -I/usr/include/kysdk/kysdk-system/

2
development-files/kysdk-system.pc
View File

@ -2,5 +2,5 @@ Name: libkysdk-system
Description: kysdk system layer
Requires: kysdk-disk kysdk-filesystem kysdk-hardware kysdk-package kysdk-proc kysdk-sysinfo kysdk-location kysdk-net kysdk-realtime
Version: 2.0.0
Libs: -L/usr/lib/kysdk/kysdk-system/ -L/usr/lib/kysdk/kysdk-base -lkydiskinfo -lkyfilewatcher -lkyhw -lkypackage -lkysysinfo -lkyrtinfo -lkylocation -lkynetinfo -lkyrealtime -Wl,-rpath=/usr/lib/kysdk/kysdk-system/
Libs: -L/usr/lib/kysdk/kysdk-system/ -L/usr/lib/kysdk/kysdk-base -lkydiskinfo -lkyfilewatcher -lkyhw -lkypackage -lkysysinfo -lkyrtinfo -lkylocation -lkynetinfo -lkyrealtime -lkybluetooth -lkyedid -lkyfan -lkyhwinfo -Wl,-rpath=/usr/lib/kysdk/kysdk-system/
Cflags: -I/usr/include/kysdk/kysdk-system/

37
src/hardware/CMakeLists.txt
View File

@ -13,7 +13,11 @@ set(hwcode
"${HARDWARE_TOP_DIR}/libkydisplay.h"
"${HARDWARE_TOP_DIR}/libkydisplay.c"
"${HARDWARE_TOP_DIR}/libkync.h"
"${HARDWARE_TOP_DIR}/libkync.c")
"${HARDWARE_TOP_DIR}/libkync.c"
"${HARDWARE_TOP_DIR}/libkyprinter.h"
"${HARDWARE_TOP_DIR}/libkyprinter.c"
"${HARDWARE_TOP_DIR}/libkyusb.h"
"${HARDWARE_TOP_DIR}/libkyusb.c")
set(bluetoothcode
@ -32,15 +36,6 @@ set(hwinfocode
"${HARDWARE_TOP_DIR}/libkyhw.h"
"${HARDWARE_TOP_DIR}/libkyhw.c")
set(printercode
"${HARDWARE_TOP_DIR}/libkyprinter.h"
"${HARDWARE_TOP_DIR}/libkyprinter.c")
set(usbcode
"${HARDWARE_TOP_DIR}/libkyusb.h"
"${HARDWARE_TOP_DIR}/libkyusb.c")
add_library(kyhw SHARED ${hwcode})
set_target_properties(kyhw PROPERTIES VERSION 2.0.0 SOVERSION 1)
@ -57,12 +52,6 @@ set_target_properties(kyfan PROPERTIES VERSION 2.0.0 SOVERSION 1)
add_library(kyhwinfo SHARED ${hwinfocode})
set_target_properties(kyhwinfo PROPERTIES VERSION 2.0.0 SOVERSION 1)
add_library(kyprinter SHARED ${printercode})
set_target_properties(kyprinter PROPERTIES VERSION 2.0.0 SOVERSION 1)
add_library(kyusb SHARED ${usbcode})
set_target_properties(kyusb PROPERTIES VERSION 2.0.0 SOVERSION 1)
add_executable(kync-test test/kync-test.c)
add_executable(kycpu-test test/kycpu-test.c)
add_executable(kyprinterlist-test test/kyprinterlist-test.c)
@ -76,19 +65,17 @@ add_executable(kybluetooth-test test/kybluetooth-test.c)
add_executable(kyfan-test test/kyfan-test.c)
add_executable(kyhw-test test/kyhw-test.c)
# 额外链接的库在这一行
target_link_libraries(kyhw kylog kyconf pthread systemd ${GLIB_LIBRARIES})
target_link_libraries(kyhw kylog kyconf pthread systemd cups curl udev ${GLIB_LIBRARIES})
target_link_libraries(kybluetooth bluetooth hd gobject-2.0)
target_link_libraries(kyedid kylog m X11 Xrandr hd)
target_link_libraries(kyfan sensors)
target_link_libraries(kyhwinfo kylog hd pci dbus-glib-1)
target_link_libraries(kyprinter cups curl)
target_link_libraries(kyusb kylog udev)
# target_link_libraries(kyhw kylog kyconf pthread systemd cups curl udev X11 Xrandr bluetooth sensors hd pci gobject-2.0 dbus-glib-1 ${GLIB_LIBRARIES})
target_link_libraries(kyprinterprint-test kyprinter)
target_link_libraries(kyprinterlist-test kyprinter)
target_link_libraries(kyprinterprint-test kyhw)
target_link_libraries(kyprinterlist-test kyhw)
target_link_libraries(kync-test kyhw)
target_link_libraries(kycpu-test kyhw)
target_link_libraries(kyusb-test kyusb)
target_link_libraries(kyusb-test kyhw)
target_link_libraries(kybios-test kyhw)
target_link_libraries(kyboard-test kyhw)
target_link_libraries(kydisplay-test kyhw)
@ -112,12 +99,6 @@ install(TARGETS kyfan
install(TARGETS kyhwinfo
DESTINATION lib/kysdk/kysdk-system)
install(TARGETS kyprinter
DESTINATION lib/kysdk/kysdk-system)
install(TARGETS kyusb
DESTINATION lib/kysdk/kysdk-system)
install(FILES libkync.h
DESTINATION include/kysdk/kysdk-system)

2
src/kysdkdbus/CMakeLists.txt
View File

@ -7,7 +7,7 @@ find_package(Qt5 COMPONENTS Core DBus REQUIRED)
include_directories(${Qt5Core_INCLUDE_DIRS})
include_directories(${Qt5DBus_INCLUDE_DIRS})
ADD_EXECUTABLE(kySdkDbus kysdkdbus.cpp main.cpp)
target_link_libraries(kySdkDbus kysysinfo kyhw kyprinter kyusb kydiskinfo kyrtinfo kynetinfo kyrealtime kydiskinfo kylocation kypackage Qt5::Core Qt5::DBus)
target_link_libraries(kySdkDbus kysysinfo kyhw kydiskinfo kyrtinfo kynetinfo kyrealtime kydiskinfo kylocation kypackage Qt5::Core Qt5::DBus)
ADD_EXECUTABLE(kySdkDbus-session kysdkrest.cpp main_rest.cpp)

1
src/proc/libkyprocess.c
View File

@ -413,6 +413,7 @@ int kdk_get_process_id(char *proc_name)
break;
}
FREE(canonical_filename);
fclose(fp);
}
if ((strcmp(name, proc_name)) == 0)