Commit Graph

372 Commits

Author SHA1 Message Date
陈志开 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
shaozhimin cb0e7dffe5 [修改]control文件,增加cJSON.h依赖 2022-08-23 14:42:09 +08:00
陈志开 da7b6cc7bf Merge branch 'v1.2.1' into 'v1.2.1'
[修改]获取系统版本号代码格式

See merge request kysdk/kysdk-system!28
2022-08-22 09:15:53 +00:00
shaozhimin df42f45eab [修改]bug#134984,获取运行时资源信息-swap分区使用率demo显示swap分区使用率为0 2022-08-22 16:47:15 +08:00
shaozhimin f0122a61d4 [修改]bug#134990,获取运行时资源信息-已用内存及占比、空闲内存、剩余可用内存信息显示错误 2022-08-22 16:45:10 +08:00
shaozhimin f2ad3834fd [修改]获取系统版本号代码格式 2022-08-15 08:41:46 +08:00
陈志开 32dd63cb90 Merge branch 'v1.2.1' into 'v1.2.1'
【修改】RISC-V架构编译错误

See merge request kysdk/kysdk-system!27
2022-08-12 01:11:17 +00:00
shaozhimin 9f49556352 【修改】control文件指定与base相关包的的依赖版本号 2022-08-10 10:29:10 +08:00
shaozhimin 5dbf258da4 【修改】RISC-V架构编译错误 2022-08-10 02:17:38 +00:00
shaozhimin f834822250 【修改】RISC-V架构编译错误 2022-08-10 10:05:25 +08:00
shaozhimin f4e6edcb76 需求#12748,【更新升级】麒麟桌面操作系统版本号体系建设;合并获取系统版本号 2022-08-10 08:57:20 +08:00
shaozhimin 5bfa673290 【修改】RISC-V架构编译错误 2022-08-09 17:07:04 +08:00
szm-min 2e4927f51d 【修改】ocr增加RISC-V架构编译 2022-08-09 03:41:10 +00:00
szm-min 6d5d9c01c9 【修改】ocr增加RISC-V架构编译 2022-08-04 16:55:11 +08:00
陈志开 3a0d1cd8a4 Merge branch 'v1.2.0' into 'v1.2.1'
【修改】ocr增加RISC-V架构编译

See merge request kysdk/kysdk-system!25
2022-08-04 06:13:02 +00:00
wangweiran@kylinos.cn 4bec28f935 【修改】ocr增加RISC-V架构编译 2022-08-04 11:10:38 +08:00
szm-min e225f0a1d5 update changelog 2022-08-02 11:36:41 +08:00
szm-min fad8c6b18d update changelog 2022-08-02 11:34:46 +08:00
szm-min fdc5e7e9c3
删除文件 debian 2022-08-02 03:20:32 +00:00
szm-min e6d10de472 merge upstream 1.2.1 2022-08-02 09:38:59 +08:00
szm-min af5c1a240d Apply patches on new upstream 1.2.1 2022-08-02 09:36:24 +08:00
szm-min 7b87d4c191 prepare for new patch list 2022-08-02 09:24:42 +08:00
szm-min 2335ec9d1e New upstream version 1.2.1 2022-08-02 09:08:48 +08:00
hanpinlong 17fc984a33 Merge branch 'v1.2.1' of https://gitlab2.kylin.com/kysdk/kysdk-system into v1.2.1 2022-07-28 15:34:32 +08:00
hanpinlong 30b3fe6ce0 取消版本号依赖 2022-07-28 15:33:52 +08:00
szm-min cbc3b8399e !4 修改systime的dbus的interface
Merge pull request !4 from szm-min/openkylin/yangtze
2022-07-28 07:03:31 +00:00
szm-min c7ab761a5e
!4 修改systime的dbus的interface
Merge pull request !4 from szm-min/openkylin/yangtze
2022-07-28 06:58:47 +00:00
陈志开 052f6c4fec Merge branch 'v1.2.1' into 'v1.2.1'
【新增】时区修改时间监测报时

See merge request kysdk/kysdk-system!24
2022-07-28 03:23:59 +00:00
shaozhimin cf776a7c49 【新增】时区修改时间监测报时 2022-07-28 11:13:52 +08:00
szm-min ea701245cd 修改systime的dbus的interface 2022-07-26 17:21:50 +08:00
wangweiran@kylinos.cn ae9b595e90 Merge branch 'v1.2.0' of gitlab2.kylin.com:kysdk/kysdk-system into v1.2.0 2022-07-21 11:01:35 +08:00
szm-min bc1c1bb5b6 update changelog 2022-07-20 12:06:30 +00:00
szm-min eed4fffd20 update changelog 2022-07-20 19:35:21 +08:00
szm-min 219f92e02e update changelog 2022-07-20 18:45:46 +08:00
szm-min 27214a24d2 修改systime的dbus的interface 2022-07-20 18:29:10 +08:00
szm-min 6c38c4d177 update changelog 2022-07-20 16:39:34 +08:00
szm-min 18c2cca0ab Merge branch 'openkylin/yangtze' of https://gitee.com/szm-min/libkysdk-system into v1.2.1 2022-07-20 16:35:28 +08:00
陈志开 737ae17b3b Merge branch 'v1.2.0' into 'v1.2.1'
【修改】避免编译时由于OCR没有二进制文件导致失败

See merge request kysdk/kysdk-system!21
2022-07-20 06:08:55 +00:00
wangweiran@kylinos.cn f735577d95 【修改】避免编译时由于OCR没有二进制文件导致失败 2022-07-18 17:14:12 +08:00
hanpinlong 424c603092 安装libkysdk-system及libkysdk-system-dev时,自动升级其依赖的子包 2022-07-18 13:59:43 +08:00
hanpinlong 9171255e4a 修改changelog 2022-07-15 16:34:39 +08:00
hanpinlong c1885b6453 修改changelog 2022-07-15 14:46:15 +08:00
handsome_feng 8b4aeedd75 update debian/changelog. 2022-07-15 02:01:47 +00:00
Debaucher 0da1e3dc4e [修改] kdk_system_get_productFeatures 接口名称变更,由 kdk_system_get_product_features变更为kdk_system_get_productFeatures 2022-07-14 16:59:28 +08:00
Debaucher 951ea3488e [新增] 增加 kdk_system_get_projectSubName 接口,用于获取操作系统项目子编号名
[新增] 增加 kdk_system_get_productFeatures 接口,用于获取操作系统产品标识码
2022-07-14 16:55:52 +08:00
陈志开 ef41cd315c Merge branch 'v1.2.0' into 'v1.2.0'
【修改】修改control文件增加sw的ocr包

See merge request kysdk/kysdk-system!20
2022-07-13 07:33:39 +00:00
wangweiran@kylinos.cn edb99be27f 【修改】修改control文件增加sw的ocr包 2022-07-13 15:22:58 +08:00
陈志开 963e05ac92 Merge branch 'v1.2.0' into 'v1.2.0'
#fix bug 126922

See merge request kysdk/kysdk-system!19
2022-07-13 06:18:23 +00:00
陈志开 c1b0c8d609 Merge branch 'v1.2.0' into 'v1.2.0'
fix bug#126838,126836,126834

See merge request kysdk/kysdk-system!18
2022-07-13 06:04:07 +00:00
szm-min b975a0eeb6 fix bug#126838,126836,126834 2022-07-04 09:00:59 +08:00