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 · 2022-08-29 02:34:36 +00:00 · a4bf694cf2
parent e855faa310 02a2327cff
commit a4bf694cf2
2 changed files with 10 additions and 1 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,12 @@
+libkysdk-system (1.2.1.1) v101; urgency=medium
+
+  *Bug号：134984,134990,125178,133854
+  *需求号：
+  *其他修改：ocr增加RISC-V架构编译
+            control文件指定与base相关包的的依赖版本号
+
+ -- shaozhimin <shaozhimin@kylinos.cn>  Tue, 23 Aug 2022 09:22:40 +0800
+
 libkysdk-system (1.2.1.0build3test3) v101; urgency=medium

  *Bug号：
--- a/src/systeminfo/libkysysinfo.h
+++ b/src/systeminfo/libkysysinfo.h
@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <cJSON.h>
+#include <cjson/cJSON.h>

 #ifdef __cplusplus
 extern "C" {