Commit Graph

370 Commits

Author SHA1 Message Date
shaozhimin bf5a351040 合并主线2.0.0.0-0k0.1~2.0.0.0-0k0.14版本到openkylin 2023-04-03 10:48:35 +08:00
szm-min adeed36162 !8 修改hardware的pc文件,CmakeLists文件,control文件中hardware依赖
Merge pull request !8 from szm-min/openkylin/yangtze
2022-11-10 05:55:20 +00:00
szm-min c2cc7fec93
!8 修改hardware的pc文件,CmakeLists文件,control文件中hardware依赖
Merge pull request !8 from szm-min/openkylin/yangtze
2022-11-10 05:53:01 +00:00
shaozhimin 5de3fccd05 修改hardware的pc文件,CmakeLists文件,control文件中hardware依赖 2022-11-10 13:42:20 +08:00
szm-min 5591d541d3 !7 修改systime的postinst文件,修改control文件中dev包的架构为all
Merge pull request !7 from szm-min/openkylin/yangtze
2022-10-27 07:45:59 +00:00
szm-min ea85aa68f8
!7 修改systime的postinst文件,修改control文件中dev包的架构为all
Merge pull request !7 from szm-min/openkylin/yangtze
2022-10-27 07:44:33 +00:00
shaozhimin bbe64a1aeb Merge remote-tracking branch 'upstream/v2.0' into openkylin/yangtze 2022-10-27 15:33:04 +08:00
shaozhimin 18eeb6715c 修改systime的postinst文件 2022-10-27 15:03:59 +08:00
shaozhimin 0e37e11857 修改control文件中dev包的架构为all 2022-10-26 17:38:32 +08:00
shaozhimin 6789c4965a update changelog 2022-10-20 12:00:26 +00:00
shaozhimin c6ba120aae update control 2022-10-20 11:56:50 +00:00
shaozhimin 02b1a363e5 update changelog 2022-10-20 19:55:34 +08:00
shaozhimin a73bc00b21 update control 2022-10-20 19:51:59 +08:00
shaozhimin d421ca830c update changelog 2022-10-20 11:41:38 +00:00
shaozhimin ab1da1d452 update changelog 2022-10-20 19:36:44 +08:00
shaozhimin 8a8a4da1ba Merge remote-tracking branch 'upstream/v2.0' into openkylin/yangtze 2022-10-20 19:35:59 +08:00
shaozhimin c58d050dc9 修改control文件 2022-10-20 18:44:52 +08:00
shaozhimin 01fb8f4a11 Merge branch 'printer' into 'v2.0'
Printer

See merge request shaozhimin/kysdk-system!1
2022-10-20 09:25:40 +00:00
shaozhimin 84e5e4984f Merge branch 'v2.0' into 'printer'
# Conflicts:
#   debian/changelog
#   debian/control
#   debian/libkysdk-hardware-dev.install
#   src/hardware/CMakeLists.txt
2022-10-20 09:25:33 +00:00
wangjingwen e9fd41286f update 2022-10-20 17:15:02 +08:00
wangjingwen b7cc9ac5e4 更新打印机相关接口 2022-10-20 16:51:34 +08:00
shaozhimin 8099028329 修改网速入参,磁盘温度 2022-10-20 16:20:40 +08:00
shaozhimin dabc2a7e5a 修改头文件中宏定义的位置 2022-10-19 15:49:52 +08:00
tianshaoshuai 853cec704b 增加获取多个端口状态接口,防火墙状态接口.location实现方式 修改为调用dbus.部分接口增加入参空值判定 2022-10-19 15:05:12 +08:00
shaozhimin 97039202cf [新增]获取磁盘转速接口,修改获取进程信息错误 2022-10-19 09:41:40 +08:00
shaozhimin 3b6d6773c1 修改control文件 2022-10-18 12:41:08 +00:00
shaozhimin bb5b4842e5 修改control文件 2022-10-18 20:35:40 +08:00
shaozhimin 1cd8e4fb90 update changelog,control,install,pc,网络,瞬时信息,地理位置 2022-10-18 09:21:30 +08:00
shaozhimin bbb95ce935 修改编译错误 2022-10-17 09:54:33 +00:00
shaozhimin 8e4280d8f0 修改编译错误 2022-10-17 17:49:42 +08:00
shaozhimin 5ce1bb2b3b update changelog 2022-10-17 09:24:37 +00:00
shaozhimin e9a712867a update changelog 2022-10-17 17:19:15 +08:00
shaozhimin fcec6c4af4 merge upstream 2.0.0.0 2022-10-17 08:29:18 +00:00
shaozhimin 7cb1c55492 merge upstream 2.0.0.0 2022-10-17 16:23:16 +08:00
shaozhimin c81a6212cf Apply patches on new upstream 2.0.0.0 2022-10-17 16:20:28 +08:00
shaozhimin 78cdbdda2c prepare for new patch list 2022-10-17 16:16:28 +08:00
shaozhimin 6c9b8e0511 修改return值和编译依赖 2022-10-14 14:51:49 +08:00
shaozhimin ee4b4d485b [新增]网络连接,外设设备枚举,网卡信息,BIOS信息,主板信息,运行时信息,网络,地理位置接口 2022-10-14 10:48:41 +08:00
shaozhimin f8b106a50c 新增获取硬件信息,固件版本号,扇区数量,磁盘类型 2022-10-13 19:16:35 +08:00
shaozhimin e8802a7c99 修改获取进程command的空间大小 2022-10-13 11:10:30 +08:00
shaozhimin 3661015ad7 修改分辨率相关control文件,free 2022-10-13 10:48:08 +08:00
shaozhimin 2d8ea02d7b 修改获取进程的cup利用率实现 2022-10-13 10:46:27 +08:00
wangjingwen ffbf9190b6 增加打印机相关接口 2022-10-12 16:15:03 +08:00
shaozhimin 9a2df68ee1 [新增]分辨率,进程信息进口 2022-09-26 16:54:10 +08:00
陈志开 a4bf694cf2 Merge branch 'v1.2.1' into 'v1.2.1'
update changelog

See merge request kysdk/kysdk-system!31
2022-08-29 02:34:36 +00:00
陈志开 e855faa310 Merge branch 'v1.2.1' into 'v1.2.1'
【修改】ocr增加armhf编译支持

See merge request kysdk/kysdk-system!32
2022-08-29 02:34:22 +00:00
shaozhimin 02a2327cff 修改sysinfo头文件 2022-08-24 15:32:17 +08:00
wangweiran 31c0f0d9fb ocr增加armhf支持 2022-08-24 11:06:38 +08:00
shaozhimin eabfa7babf update changelog 2022-08-24 10:49:44 +08:00
陈志开 e4cbc0dd99 Merge branch 'v1.2.1' into 'v1.2.1'
[修改]control文件,增加cJSON.h依赖

See merge request kysdk/kysdk-system!30
2022-08-23 10:15:37 +00:00