From a291c48708a28fb05385c7202f821877962529fa Mon Sep 17 00:00:00 2001
From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
Date: Tue, 21 Feb 2023 15:13:16 +0800
Subject: [PATCH] fix update cpu-rt period failed and fix layer size type as
 int64

Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
(cherry picked from commit f8cec86372b80b97a807a74ca1314651e2cdf2df)
---
 0001-fix-update-cpu-rt-period-failed.patch | 37 ++++++++++++++++++++++
 0002-fix-layer-size-type-as-int64.patch    | 26 +++++++++++++++
 lcr.spec                                   | 11 +++++--
 3 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 0001-fix-update-cpu-rt-period-failed.patch
 create mode 100644 0002-fix-layer-size-type-as-int64.patch

diff --git a/0001-fix-update-cpu-rt-period-failed.patch b/0001-fix-update-cpu-rt-period-failed.patch
new file mode 100644
index 0000000..6fcfa18
--- /dev/null
+++ b/0001-fix-update-cpu-rt-period-failed.patch
@@ -0,0 +1,37 @@
+From 42cf57e75e50457c1a4ee28d286aa4644c9c266a Mon Sep 17 00:00:00 2001
+From: songbuhuang <544824346@qq.com>
+Date: Wed, 8 Feb 2023 10:40:20 +0800
+Subject: [PATCH 1/2] fix update cpu-rt period failed
+
+Signed-off-by: songbuhuang <544824346@qq.com>
+---
+ src/lcrcontainer_execute.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/lcrcontainer_execute.c b/src/lcrcontainer_execute.c
+index ac49c50..4c49a28 100644
+--- a/src/lcrcontainer_execute.c
++++ b/src/lcrcontainer_execute.c
+@@ -363,14 +363,15 @@ static bool update_resources_cpu_v1(struct lxc_container *c, const struct lcr_cg
+     if (!update_resources_cpuset_mems(c, cr)) {
+         goto err_out;
+     }
+-
+-    if (update_resources_cpu_rt_period(c, cr) != 0) {
+-        goto err_out;
+-    }
++    
+     if (update_resources_cpu_rt_runtime(c, cr) != 0) {
+         goto err_out;
+     }
+ 
++    if (update_resources_cpu_rt_period(c, cr) != 0) {
++        goto err_out;
++    }
++    
+     ret = true;
+ err_out:
+     return ret;
+-- 
+2.25.1
+
diff --git a/0002-fix-layer-size-type-as-int64.patch b/0002-fix-layer-size-type-as-int64.patch
new file mode 100644
index 0000000..35f55af
--- /dev/null
+++ b/0002-fix-layer-size-type-as-int64.patch
@@ -0,0 +1,26 @@
+From 9e9fbc213ce485a53b8dee07ad923369096ae899 Mon Sep 17 00:00:00 2001
+From: "Neil.wrz" <wangrunze13@huawei.com>
+Date: Mon, 20 Feb 2023 22:24:30 -0800
+Subject: [PATCH 2/2] fix layer size type as int64
+
+Signed-off-by: Neil.wrz <wangrunze13@huawei.com>
+---
+ src/json/schema/registry/manifest_schema2.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/json/schema/registry/manifest_schema2.json b/src/json/schema/registry/manifest_schema2.json
+index 44f31db..78cc68c 100644
+--- a/src/json/schema/registry/manifest_schema2.json
++++ b/src/json/schema/registry/manifest_schema2.json
+@@ -44,7 +44,7 @@
+             "type": "string"
+           },
+           "size": {
+-            "type": "integer"
++            "type": "int64"
+           },
+           "digest": {
+             "$ref": "../defs.json#/definitions/digest"
+-- 
+2.25.1
+
diff --git a/lcr.spec b/lcr.spec
index bf1b2c3..8700053 100644
--- a/lcr.spec
+++ b/lcr.spec
@@ -1,5 +1,5 @@
 %global _version 2.0.9
-%global _release 2
+%global _release 3
 %global _inner_name isula_libutils
 
 Name:      lcr
@@ -12,7 +12,8 @@ Group:     Applications/System
 License:   LGPLv2.1+
 BuildRoot: %{_tmppath}/lcr-%{version}
 
-
+Patch0001:	0001-fix-update-cpu-rt-period-failed.patch
+Patch0002:	0002-fix-layer-size-type-as-int64.patch
 
 %define lxcver_lower 4.0.3-2022102400
 %define lxcver_upper 4.0.3-2022102500
@@ -108,6 +109,12 @@ rm -rf %{buildroot}
 %{_includedir}/%{_inner_name}/*.h
 
 %changelog
+* Tue Feb 21 2023 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 2.0.9-3
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:fix update cpu-rt period failed and fix layer size type as int64
+
 * Thu Feb 16 2023 Wenlong Zhang<zhangwenlong@loongson.cn> - 2.0.9-2
 - Type:enhancement
 - CVE:NA