diff --git a/0019-backport-rm-attribute-visibility-before-struct.patch b/0019-fix-invalid-usage-of-arrtibute-visibility.patch similarity index 100% rename from 0019-backport-rm-attribute-visibility-before-struct.patch rename to 0019-fix-invalid-usage-of-arrtibute-visibility.patch diff --git a/0020-unify-nri-variable-format.patch b/0020-unify-nri-variable-format.patch new file mode 100644 index 0000000000000000000000000000000000000000..bfd88a2e16a5f5f003b7b0de99d72451ecca6653 --- /dev/null +++ b/0020-unify-nri-variable-format.patch @@ -0,0 +1,42 @@ +From 6fd7cdec3c383461695f45e96d59353c68ecf286 Mon Sep 17 00:00:00 2001 +From: zhongtao +Date: Wed, 4 Sep 2024 10:38:08 +0800 +Subject: [PATCH 20/20] unify nri variable format + +Signed-off-by: zhongtao +--- + src/json/schema/isulad-daemon-configs.json | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/json/schema/isulad-daemon-configs.json b/src/json/schema/isulad-daemon-configs.json +index 7b148bd..e21c3cf 100644 +--- a/src/json/schema/isulad-daemon-configs.json ++++ b/src/json/schema/isulad-daemon-configs.json +@@ -106,19 +106,19 @@ + "disable-connections" : { + "type": "boolean" + }, +- "plugin_config_path": { ++ "plugin-config-path": { + "type": "string" + }, +- "plugin_path": { ++ "plugin-path": { + "type": "string" + }, +- "nri_socket_path": { ++ "nri-socket-path": { + "type": "string" + }, +- "plugin_registration_timeout": { ++ "plugin-registration-timeout": { + "type": "uint64" + }, +- "plugin_requst_timeout": { ++ "plugin-requst-timeout": { + "type": "uint64" + }, + "image-layer-check": { +-- +2.33.0 + diff --git a/lcr.spec b/lcr.spec index d45ce3cfc2c8a33ffca2a8e989ae45b0cd91de6b..480823f3e08c49de9d7438a4aacf1b517c091848 100644 --- a/lcr.spec +++ b/lcr.spec @@ -1,5 +1,5 @@ %global _version 2.1.4 -%global _release 11 +%global _release 12 %global _inner_name isula_libutils %global enable_lxc 1 @@ -31,10 +31,12 @@ Patch0015: 0015-fix-invalid-args-len-set-in-execute_lxc_attach.patch Patch0016: 0016-add-nri-definitions.patch Patch0017: 0017-add-struct-for-nri.patch Patch0018: 0018-add-nri-def-in-host-config.patch -Patch0019: 0019-backport-rm-attribute-visibility-before-struct.patch +Patch0019: 0019-fix-invalid-usage-of-arrtibute-visibility.patch +Patch0020: 0020-unify-nri-variable-format.patch %define lxcver_lower 4.0.3-2022102400 %define lxcver_upper 5.0.3 +%define _lto_cflags %{nil} BuildRequires: cmake gcc gcc-c++ git BuildRequires: zlib-devel yajl-devel gtest-devel @@ -153,11 +155,17 @@ rm -rf %{buildroot} %{_includedir}/lcr/utils_compile.h %changelog +* Thu Oct 17 2024 wujichao - 2.1.4-12 +- Type:enhancement +- CVE:NA +- SUG:NA +- DESC:unify nri variable format + * Tue Sep 3 2024 yuanchao<1050706328@qq.com> - 2.1.4-11 - Type:enhancement - CVE:NA - SUG:NA -- DESC:backport(rm attribute 'visibility' before struct),fix changelog,fix `clang: error: argument unused during compilation: '-fstack-clash-protection' [-Werror,-Wunused-command-line-argument]`,support clang build +- DESC:fix invalid usage of arrtibute visibility * Mon Aug 19 2024 zhongtao - 2.1.4-10 - Type:enhancement