diff --git a/debian/changelog b/debian/changelog index 79a0c52..d4dc5e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libkysdk-system (2.0.0.0-ok6) yangtze; urgency=medium + + *Bug号: + *需求号: + *其他修改:修改hardware的pc文件 + 修改hardware的CmakeLists文件 + 修改control文件中hardware依赖 + + -- szm-min Thu, 27 Oct 2022 15:32:30 +0800 + libkysdk-system (2.0.0.0-ok5) yangtze; urgency=medium *Bug号: diff --git a/debian/control b/debian/control index b88fff8..857941b 100644 --- a/debian/control +++ b/debian/control @@ -184,8 +184,9 @@ Depends: ${shlibs:Depends}, libkysdk-config(>=1.2.0), systemd, libkysdk-systemcommon, - libcups2-dev, - libcurl4-openssl-dev, + libcups2, + libcurl4, + libudev1 Multi-Arch: same Description: 硬件信息获取库 @@ -198,7 +199,9 @@ Depends: ${shlibs:Depends}, libkysdk-log-dev(>=1.2.0), libkysdk-config-dev(>=1.2.0), libsystemd-dev, - libcups2-dev + libcups2-dev, + libcurl4-openssl-dev, + libudev-dev Multi-Arch: foreign Description: 硬件信息获取库 - 开发库 diff --git a/development-files/kysdk-hardware.pc b/development-files/kysdk-hardware.pc index a7e4650..25af4cf 100644 --- a/development-files/kysdk-hardware.pc +++ b/development-files/kysdk-hardware.pc @@ -1,6 +1,6 @@ Name: libkysdk-hardware Description: kysdk system layer hardware component -Requires: kysdk-log kysdk-config libsystemd libudev1 +Requires: kysdk-log kysdk-config libsystemd libudev Version: 2.0.0 Libs: -L/usr/lib/kysdk/kysdk-system/ -lkyhw -Wl,-rpath=/usr/lib/kysdk/kysdk-system/ Cflags: -I/usr/include/kysdk/kysdk-system/ \ No newline at end of file diff --git a/src/hardware/CMakeLists.txt b/src/hardware/CMakeLists.txt index 5e8e97e..46fe4d6 100644 --- a/src/hardware/CMakeLists.txt +++ b/src/hardware/CMakeLists.txt @@ -6,16 +6,13 @@ add_executable(kync-test test/kync-test.c) add_executable(kycpu-test test/kycpu-test.c) add_executable(kyprinterlist-test test/kyprinterlist-test.c) add_executable(kyprinterprint-test test/kyprinterprint-test.c) -# 额外链接的库在这一行 -target_link_libraries(kyhw kylog kyconf pthread systemd cups curl) -target_link_libraries(kync-test kyhw) -target_link_libraries(kycpu-test kyhw) -target_link_libraries(kyprinterprint-test kyhw) -target_link_libraries(kyprinterlist-test kyhw) add_executable(kyusb-test test/kyusb-test.c) add_executable(kybios-test test/kybios-test.c) add_executable(kyboard-test test/kyboard-test.c) -target_link_libraries(kyhw kylog kyconf pthread systemd udev) +# 额外链接的库在这一行 +target_link_libraries(kyhw kylog kyconf pthread systemd cups curl udev) +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 kyhw)