diff --git a/0001-modified-ipconfig.json-to-adapt-to-newest-version-of.patch b/0001-modified-ipconfig.json-to-adapt-to-newest-version-of.patch deleted file mode 100644 index 79873e3..0000000 --- a/0001-modified-ipconfig.json-to-adapt-to-newest-version-of.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c3013bfda83f3bcdcf518f29ad942bd99b4a356c Mon Sep 17 00:00:00 2001 -From: chengzrz -Date: Thu, 28 Oct 2021 03:18:15 -0400 -Subject: [PATCH 1/6] modified ipconfig.json to adapt to newest version of cni - plugins - ---- - src/json/schema/cni/network/ipconfig.json | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/json/schema/cni/network/ipconfig.json b/src/json/schema/cni/network/ipconfig.json -index 4854118..9f3a2fe 100644 ---- a/src/json/schema/cni/network/ipconfig.json -+++ b/src/json/schema/cni/network/ipconfig.json -@@ -16,7 +16,6 @@ - } - }, - "required": [ -- "version", - "address" - ] - } --- -2.20.1 - diff --git a/0002-disable-lxc_keep-with-oci-image.patch b/0002-disable-lxc_keep-with-oci-image.patch deleted file mode 100644 index 5f7255e..0000000 --- a/0002-disable-lxc_keep-with-oci-image.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 409f5bf06e782fe5cbcf01e463b114c973b33dcb Mon Sep 17 00:00:00 2001 -From: gaohuatao -Date: Thu, 21 Oct 2021 12:11:00 +0800 -Subject: [PATCH 2/6] disable lxc_keep with oci image - -Signed-off-by: gaohuatao ---- - src/lcrcontainer.h | 1 + - src/lcrcontainer_execute.c | 13 +++++++++++++ - 2 files changed, 14 insertions(+) - -diff --git a/src/lcrcontainer.h b/src/lcrcontainer.h -index ecf3655..062d681 100644 ---- a/src/lcrcontainer.h -+++ b/src/lcrcontainer.h -@@ -201,6 +201,7 @@ struct lcr_start_request { - uint32_t start_timeout; - const char *container_pidfile; - const char *exit_fifo; -+ bool image_type_oci; - }; - bool lcr_start(const struct lcr_start_request *request); - -diff --git a/src/lcrcontainer_execute.c b/src/lcrcontainer_execute.c -index 4c8e0e6..d04a467 100644 ---- a/src/lcrcontainer_execute.c -+++ b/src/lcrcontainer_execute.c -@@ -966,7 +966,9 @@ void execute_lxc_start(const char *name, const char *path, const struct lcr_star - { - // should check the size of params when add new params. - char *params[PARAM_NUM] = {NULL}; -+ char buf[PARAM_NUM] = { 0 }; - size_t i = 0; -+ int nret = 0; - - if (lcr_util_check_inherited(true, -1) != 0) { - COMMAND_ERROR("Close inherited fds failed"); -@@ -983,6 +985,17 @@ void execute_lxc_start(const char *name, const char *path, const struct lcr_star - add_array_kv(params, PARAM_NUM, &i, "--in-fifo", request->console_fifos[0]); - add_array_kv(params, PARAM_NUM, &i, "--out-fifo", request->console_fifos[1]); - add_array_kv(params, PARAM_NUM, &i, "--err-fifo", request->console_fifos[2]); -+ -+ nret = snprintf(buf, sizeof(buf), "%s=true", LXC_IMAGE_OCI_KEY); -+ if (nret < 0 || (size_t)nret >= sizeof(buf)) { -+ COMMAND_ERROR("Format KEY=VAL of image type error"); -+ exit(EXIT_FAILURE); -+ } -+ -+ if (request->image_type_oci) { -+ add_array_kv(params, PARAM_NUM, &i, "-s", buf); -+ } -+ - if (!request->tty) { - add_array_elem(params, PARAM_NUM, &i, "--disable-pty"); - } --- -2.20.1 - diff --git a/0003-add-self-def-runtime-for-shimv2.patch b/0003-add-self-def-runtime-for-shimv2.patch deleted file mode 100644 index 9ddbddd..0000000 --- a/0003-add-self-def-runtime-for-shimv2.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 456e7da83acd8e5ad6d478d41d5f6e81c5611964 Mon Sep 17 00:00:00 2001 -From: gaohuatao -Date: Tue, 16 Nov 2021 11:35:11 +0800 -Subject: [PATCH 3/6] add self def runtime for shimv2 - -Signed-off-by: gaohuatao ---- - 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 - diff --git a/0004-move-cri-runtimes-to-daemon.patch b/0004-move-cri-runtimes-to-daemon.patch deleted file mode 100644 index 08496b0..0000000 --- a/0004-move-cri-runtimes-to-daemon.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3297f92307fd8a733f5d72ad2a0a85f7e61fb473 Mon Sep 17 00:00:00 2001 -From: gaohuatao -Date: Tue, 16 Nov 2021 18:53:33 +0800 -Subject: [PATCH 4/6] move cri runtimes to daemon - -Signed-off-by: gaohuatao ---- - 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 - diff --git a/0005-config-v2-and-inspect-were-modified-to-support-modif.patch b/0005-config-v2-and-inspect-were-modified-to-support-modif.patch deleted file mode 100644 index 79bf191..0000000 --- a/0005-config-v2-and-inspect-were-modified-to-support-modif.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a4ad5c5d0a428d1e603e91d14585f942e0e7453c Mon Sep 17 00:00:00 2001 -From: chengzrz -Date: Thu, 11 Nov 2021 16:47:58 +0800 -Subject: [PATCH 5/6] config-v2 and inspect were modified to support - modifications on isulad - -Signed-off-by: chengzrz ---- - src/json/schema/container/config-v2.json | 8 ++++++++ - src/json/schema/container/inspect.json | 3 +++ - 2 files changed, 11 insertions(+) - -diff --git a/src/json/schema/container/config-v2.json b/src/json/schema/container/config-v2.json -index c4964d4..0e64d14 100644 ---- a/src/json/schema/container/config-v2.json -+++ b/src/json/schema/container/config-v2.json -@@ -43,6 +43,14 @@ - "BaseFs": { - "type": "string" - }, -+ "NetworkSettings": { -+ "type": "object", -+ "properties": { -+ "SandboxKey": { -+ "type": "string" -+ } -+ } -+ }, - "MountPoints": { - "type": "object", - "patternProperties": { -diff --git a/src/json/schema/container/inspect.json b/src/json/schema/container/inspect.json -index 66307bc..ef7792f 100644 ---- a/src/json/schema/container/inspect.json -+++ b/src/json/schema/container/inspect.json -@@ -182,6 +182,9 @@ - "properties": { - "IPAddress": { - "type": "string" -+ }, -+ "SandboxKey":{ -+ "type": "string" - } - } - } --- -2.20.1 - diff --git a/0006-support-null-value-in-json.patch b/0006-support-null-value-in-json.patch deleted file mode 100644 index 6b49ff2..0000000 --- a/0006-support-null-value-in-json.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b6845431ea3aafc32419430bef4a3e59781d7133 Mon Sep 17 00:00:00 2001 -From: haozi007 -Date: Wed, 24 Nov 2021 07:38:39 +0000 -Subject: [PATCH 6/6] support null value in json - -Signed-off-by: haozi007 ---- - third_party/libocispec/common_c.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/third_party/libocispec/common_c.py b/third_party/libocispec/common_c.py -index 78224c7..968d5d2 100644 ---- a/third_party/libocispec/common_c.py -+++ b/third_party/libocispec/common_c.py -@@ -126,6 +126,7 @@ static yajl_gen_status gen_yajl_val (yajl_val obj, yajl_gen g, parser_error *err - case yajl_t_false: - return yajl_gen_bool (g, false); - case yajl_t_null: -+ return yajl_gen_null(g); - case yajl_t_any: - return __stat; - } --- -2.20.1 - diff --git a/0007-fix-the-error-of-gcc-compilation-optimization-level.patch b/0007-fix-the-error-of-gcc-compilation-optimization-level.patch deleted file mode 100644 index 7dd0625..0000000 --- a/0007-fix-the-error-of-gcc-compilation-optimization-level.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 312ac2de6c5b1f7ea446c968f30139149810318b Mon Sep 17 00:00:00 2001 -From: wujing -Date: Thu, 9 Dec 2021 10:30:45 +0800 -Subject: [PATCH] fix the error of gcc compilation optimization level - -Signed-off-by: wujing ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5222555..557ac34 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,7 +30,7 @@ endif() - - option(DEBUG "set lcr gcc option" ON) - if (DEBUG STREQUAL "ON") -- add_definitions("-g -o2") -+ add_definitions("-g -O2") - endif() - - option(ENABLE_UT "enable ut" OFF) --- -2.25.1 - diff --git a/lcr.spec b/lcr.spec index b49858e..6f06a95 100644 --- a/lcr.spec +++ b/lcr.spec @@ -1,5 +1,5 @@ -%global _version 2.0.6 -%global _release 8 +%global _version 2.0.7 +%global _release 1 %global _inner_name isula_libutils Name: lcr @@ -12,14 +12,6 @@ Group: Applications/System License: LGPLv2.1+ BuildRoot: %{_tmppath}/lcr-%{version} -Patch0001: 0001-modified-ipconfig.json-to-adapt-to-newest-version-of.patch -Patch0002: 0002-disable-lxc_keep-with-oci-image.patch -Patch0003: 0003-add-self-def-runtime-for-shimv2.patch -Patch0004: 0004-move-cri-runtimes-to-daemon.patch -Patch0005: 0005-config-v2-and-inspect-were-modified-to-support-modif.patch -Patch0006: 0006-support-null-value-in-json.patch -Patch0007: 0007-fix-the-error-of-gcc-compilation-optimization-level.patch - %define lxcver 4.0.3-2021112501 BuildRequires: cmake gcc gcc-c++ git @@ -58,7 +50,7 @@ the %{name}-libs package contains libraries for running iSula applications. %prep -%autosetup -n lcr -Sgit -p1 +%autosetup -n lcr-v%{_version} -Sgit -p1 %build mkdir -p build @@ -107,6 +99,12 @@ rm -rf %{buildroot} %{_includedir}/%{_inner_name}/*.h %changelog +* Thu Feb 24 2022 wangfengtu - 2.0.7-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: update to v2.0.7 + * Wed Dec 29 2021 wangfengtu - 2.0.6-8 - Type:bugfix - ID:NA @@ -143,13 +141,13 @@ rm -rf %{buildroot} - SUG:NA - DESC: remove build platform restrictions -* Thu Nov 09 2021 gaohuatao - 2.0.6-2 +* Tue Nov 09 2021 gaohuatao - 2.0.6-2 - Type:enhancement - ID:NA - SUG:NA - DESC: update source -* Thu Nov 09 2021 gaohuatao - 2.0.6-1 +* Tue Nov 09 2021 gaohuatao - 2.0.6-1 - Type:enhancement - ID:NA - SUG:NA diff --git a/v2.0.6.tar.gz b/v2.0.6.tar.gz deleted file mode 100644 index e42aef1..0000000 Binary files a/v2.0.6.tar.gz and /dev/null differ diff --git a/v2.0.7.tar.gz b/v2.0.7.tar.gz new file mode 100644 index 0000000..f684d66 Binary files /dev/null and b/v2.0.7.tar.gz differ