!8 修改hardware的pc文件,CmakeLists文件,control文件中hardware依赖
Merge pull request !8 from szm-min/openkylin/yangtze
This commit is contained in:
commit
c2cc7fec93
|
@ -1,3 +1,13 @@
|
||||||
|
libkysdk-system (2.0.0.0-ok6) yangtze; urgency=medium
|
||||||
|
|
||||||
|
*Bug号:
|
||||||
|
*需求号:
|
||||||
|
*其他修改:修改hardware的pc文件
|
||||||
|
修改hardware的CmakeLists文件
|
||||||
|
修改control文件中hardware依赖
|
||||||
|
|
||||||
|
-- szm-min <shaozhimin@kylinos.cn> Thu, 27 Oct 2022 15:32:30 +0800
|
||||||
|
|
||||||
libkysdk-system (2.0.0.0-ok5) yangtze; urgency=medium
|
libkysdk-system (2.0.0.0-ok5) yangtze; urgency=medium
|
||||||
|
|
||||||
*Bug号:
|
*Bug号:
|
||||||
|
|
|
@ -184,8 +184,9 @@ Depends: ${shlibs:Depends},
|
||||||
libkysdk-config(>=1.2.0),
|
libkysdk-config(>=1.2.0),
|
||||||
systemd,
|
systemd,
|
||||||
libkysdk-systemcommon,
|
libkysdk-systemcommon,
|
||||||
libcups2-dev,
|
libcups2,
|
||||||
libcurl4-openssl-dev,
|
libcurl4,
|
||||||
|
libudev1
|
||||||
Multi-Arch: same
|
Multi-Arch: same
|
||||||
Description: 硬件信息获取库
|
Description: 硬件信息获取库
|
||||||
|
|
||||||
|
@ -198,7 +199,9 @@ Depends: ${shlibs:Depends},
|
||||||
libkysdk-log-dev(>=1.2.0),
|
libkysdk-log-dev(>=1.2.0),
|
||||||
libkysdk-config-dev(>=1.2.0),
|
libkysdk-config-dev(>=1.2.0),
|
||||||
libsystemd-dev,
|
libsystemd-dev,
|
||||||
libcups2-dev
|
libcups2-dev,
|
||||||
|
libcurl4-openssl-dev,
|
||||||
|
libudev-dev
|
||||||
Multi-Arch: foreign
|
Multi-Arch: foreign
|
||||||
Description: 硬件信息获取库 - 开发库
|
Description: 硬件信息获取库 - 开发库
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
Name: libkysdk-hardware
|
Name: libkysdk-hardware
|
||||||
Description: kysdk system layer hardware component
|
Description: kysdk system layer hardware component
|
||||||
Requires: kysdk-log kysdk-config libsystemd libudev1
|
Requires: kysdk-log kysdk-config libsystemd libudev
|
||||||
Version: 2.0.0
|
Version: 2.0.0
|
||||||
Libs: -L/usr/lib/kysdk/kysdk-system/ -lkyhw -Wl,-rpath=/usr/lib/kysdk/kysdk-system/
|
Libs: -L/usr/lib/kysdk/kysdk-system/ -lkyhw -Wl,-rpath=/usr/lib/kysdk/kysdk-system/
|
||||||
Cflags: -I/usr/include/kysdk/kysdk-system/
|
Cflags: -I/usr/include/kysdk/kysdk-system/
|
|
@ -6,16 +6,13 @@ add_executable(kync-test test/kync-test.c)
|
||||||
add_executable(kycpu-test test/kycpu-test.c)
|
add_executable(kycpu-test test/kycpu-test.c)
|
||||||
add_executable(kyprinterlist-test test/kyprinterlist-test.c)
|
add_executable(kyprinterlist-test test/kyprinterlist-test.c)
|
||||||
add_executable(kyprinterprint-test test/kyprinterprint-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(kyusb-test test/kyusb-test.c)
|
||||||
add_executable(kybios-test test/kybios-test.c)
|
add_executable(kybios-test test/kybios-test.c)
|
||||||
add_executable(kyboard-test test/kyboard-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(kync-test kyhw)
|
||||||
target_link_libraries(kycpu-test kyhw)
|
target_link_libraries(kycpu-test kyhw)
|
||||||
target_link_libraries(kyusb-test kyhw)
|
target_link_libraries(kyusb-test kyhw)
|
||||||
|
|
Loading…
Reference in New Issue