!94 add self def runtime for shimv2
From: @gaohuatao Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian
This commit is contained in:
commit
703aafce2e
27
0003-add-self-def-runtime-for-shimv2.patch
Normal file
27
0003-add-self-def-runtime-for-shimv2.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
From 456e7da83acd8e5ad6d478d41d5f6e81c5611964 Mon Sep 17 00:00:00 2001
|
||||||
|
From: gaohuatao <gaohuatao@huawei.com>
|
||||||
|
Date: Tue, 16 Nov 2021 11:35:11 +0800
|
||||||
|
Subject: [PATCH 3/4] add self def runtime for shimv2
|
||||||
|
|
||||||
|
Signed-off-by: gaohuatao <gaohuatao@huawei.com>
|
||||||
|
---
|
||||||
|
src/json/schema/isulad-daemon-constants.json | 3 +++
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/json/schema/isulad-daemon-constants.json b/src/json/schema/isulad-daemon-constants.json
|
||||||
|
index bb601b5..7c03a6e 100644
|
||||||
|
--- a/src/json/schema/isulad-daemon-constants.json
|
||||||
|
+++ b/src/json/schema/isulad-daemon-constants.json
|
||||||
|
@@ -7,6 +7,9 @@
|
||||||
|
},
|
||||||
|
"registry-transformation": {
|
||||||
|
"$ref": "defs.json#/definitions/mapStringString"
|
||||||
|
+ },
|
||||||
|
+ "cri-shimv2-runtimes": {
|
||||||
|
+ "$ref": "defs.json#/definitions/mapStringString"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.20.1
|
||||||
|
|
||||||
42
0004-move-cri-runtimes-to-daemon.patch
Normal file
42
0004-move-cri-runtimes-to-daemon.patch
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
From 3297f92307fd8a733f5d72ad2a0a85f7e61fb473 Mon Sep 17 00:00:00 2001
|
||||||
|
From: gaohuatao <gaohuatao@huawei.com>
|
||||||
|
Date: Tue, 16 Nov 2021 18:53:33 +0800
|
||||||
|
Subject: [PATCH 4/4] move cri runtimes to daemon
|
||||||
|
|
||||||
|
Signed-off-by: gaohuatao <gaohuatao@huawei.com>
|
||||||
|
---
|
||||||
|
src/json/schema/isulad-daemon-configs.json | 3 +++
|
||||||
|
src/json/schema/isulad-daemon-constants.json | 3 ---
|
||||||
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/json/schema/isulad-daemon-configs.json b/src/json/schema/isulad-daemon-configs.json
|
||||||
|
index 27fd916..1134d37 100644
|
||||||
|
--- a/src/json/schema/isulad-daemon-configs.json
|
||||||
|
+++ b/src/json/schema/isulad-daemon-configs.json
|
||||||
|
@@ -26,6 +26,9 @@
|
||||||
|
"log-opts": {
|
||||||
|
"$ref": "defs.json#/definitions/mapStringString"
|
||||||
|
},
|
||||||
|
+ "cri-runtimes": {
|
||||||
|
+ "$ref": "defs.json#/definitions/mapStringString"
|
||||||
|
+ },
|
||||||
|
"container-log": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
diff --git a/src/json/schema/isulad-daemon-constants.json b/src/json/schema/isulad-daemon-constants.json
|
||||||
|
index 7c03a6e..bb601b5 100644
|
||||||
|
--- a/src/json/schema/isulad-daemon-constants.json
|
||||||
|
+++ b/src/json/schema/isulad-daemon-constants.json
|
||||||
|
@@ -7,9 +7,6 @@
|
||||||
|
},
|
||||||
|
"registry-transformation": {
|
||||||
|
"$ref": "defs.json#/definitions/mapStringString"
|
||||||
|
- },
|
||||||
|
- "cri-shimv2-runtimes": {
|
||||||
|
- "$ref": "defs.json#/definitions/mapStringString"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.20.1
|
||||||
|
|
||||||
10
lcr.spec
10
lcr.spec
@ -1,5 +1,5 @@
|
|||||||
%global _version 2.0.6
|
%global _version 2.0.6
|
||||||
%global _release 3
|
%global _release 4
|
||||||
%global _inner_name isula_libutils
|
%global _inner_name isula_libutils
|
||||||
|
|
||||||
Name: lcr
|
Name: lcr
|
||||||
@ -14,6 +14,8 @@ BuildRoot: %{_tmppath}/lcr-%{version}
|
|||||||
|
|
||||||
Patch1: 0001-modified-ipconfig.json-to-adapt-to-newest-version-of.patch
|
Patch1: 0001-modified-ipconfig.json-to-adapt-to-newest-version-of.patch
|
||||||
Patch2: 0002-disable-lxc_keep-with-oci-image.patch
|
Patch2: 0002-disable-lxc_keep-with-oci-image.patch
|
||||||
|
Patch3: 0003-add-self-def-runtime-for-shimv2.patch
|
||||||
|
Patch4: 0004-move-cri-runtimes-to-daemon.patch
|
||||||
|
|
||||||
%define lxcver 4.0.3-2021012801
|
%define lxcver 4.0.3-2021012801
|
||||||
|
|
||||||
@ -102,6 +104,12 @@ rm -rf %{buildroot}
|
|||||||
%{_includedir}/%{_inner_name}/*.h
|
%{_includedir}/%{_inner_name}/*.h
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Nov 19 2021 gaohuatao <gaohuatao@huawei.com> - 2.0.6-4
|
||||||
|
- Type:enhancement
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC: sync from upstream
|
||||||
|
|
||||||
* Tue Nov 16 2021 wujing <wujing50@huawei.com> - 2.0.6-3
|
* Tue Nov 16 2021 wujing <wujing50@huawei.com> - 2.0.6-3
|
||||||
- Type:enhancement
|
- Type:enhancement
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user