Commit Graph

293 Commits

Author SHA1 Message Date
luoyaoming cd99b75816 No change rebuild for openkylin 2023-05-11 15:56:12 +08:00
shaozhimin 003e98ae27 update date 2023-04-24 13:16:21 +00:00
shaozhimin eeaa016bf2 update date 2023-04-24 21:14:38 +08:00
shaozhimin b7bac2cf98 修改patch 2023-04-24 21:10:48 +08:00
shaozhimin faafc2cb32 delete patch 2023-04-24 21:02:45 +08:00
shaozhimin a6ca44a5a4 Merge branch 'openkylin/yangtze' into packaging/openkylin/yangtze 2023-04-24 20:52:00 +08:00
shaozhimin e4fd7ec3e2 导入2.1版本,并删除debian目录 2023-04-24 17:39:30 +08:00
szm-min 3d7d41db3d
!13 新增需求21847 新增获取显示系统版本类别接口
Merge pull request !13 from szm-min/openkylin/yangtze
2023-04-24 09:10:00 +00:00
shaozhimin f91d3a2b0f 修改kydate_test.c文件 2023-04-24 17:03:43 +08:00
shaozhimin 937ba87c14 Merge remote-tracking branch 'upstream/openkylin/yangtze' into openkylin/yangtze 2023-04-24 16:38:30 +08:00
shaozhimin 6a90789e96 新增需求21847 新增获取显示系统版本类别接口 2023-04-24 16:30:27 +08:00
shaozhimin 26a2986df7 update changelog 2023-04-04 02:03:46 +00:00
shaozhimin 2aa694d021 update changelog 2023-04-04 10:01:51 +08:00
szm-min 4e02876574
!12 删除realtime模块的3rdparty目录,改用popen实现
Merge pull request !12 from szm-min/openkylin/yangtze
2023-04-04 01:58:48 +00:00
shaozhimin 7e333d1b43 删除realtime模块的3rdparty目录,改用popen实现 2023-04-04 09:56:54 +08:00
shaozhimin ea6cd123dc 修改编译错误 2023-04-03 03:45:11 +00:00
shaozhimin 0abb4cbccd 修改编译错误 2023-04-03 11:43:05 +08:00
shaozhimin 24493d978f update date 2023-04-03 03:01:15 +00:00
shaozhimin 1c76c9857b update date 2023-04-03 10:57:38 +08:00
szm-min ac09b37fef
!11 合并主线2.0.0.0-0k0.1~2.0.0.0-0k0.14版本到openkylin
Merge pull request !11 from szm-min/openkylin/yangtze
2023-04-03 02:51:07 +00:00
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