diff --git a/meta-openeuler/recipes-core/iSulad/iSulad/0001-fix-bug-disable-selinux-not-selinux-label-file.patch b/meta-openeuler/recipes-core/iSulad/iSulad/0001-fix-bug-disable-selinux-not-selinux-label-file.patch deleted file mode 100644 index 59b601fcb09fc7edf7ecb7861dc6b0bb3d969dd3..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-core/iSulad/iSulad/0001-fix-bug-disable-selinux-not-selinux-label-file.patch +++ /dev/null @@ -1,45 +0,0 @@ -commit f05e1aaea1ac77f6294afe993197609aaf725c52 -Author: dongxinhua -Date: Fri Sep 17 20:21:09 2021 +0800 - - fix bug when disable selinux,should not contain selinux_label.c file - - Signed-off-by: dongxinhua - -diff --git a/src/daemon/modules/image/CMakeLists.txt b/src/daemon/modules/image/CMakeLists.txt -index 00a096e..d24a4e8 100644 ---- a/src/daemon/modules/image/CMakeLists.txt -+++ b/src/daemon/modules/image/CMakeLists.txt -@@ -45,7 +45,7 @@ set(IMAGE_INCS - # set sources and headers for libisulad_img - set(LIB_ISULAD_IMG libisulad_img) - --add_library(${LIB_ISULAD_IMG} ${LIBTYPE} -+set(ISULAD_IMG_SRCS - ${local_image_srcs} - ${CMAKE_SOURCE_DIR}/src/utils/cutils/utils.c - ${CMAKE_SOURCE_DIR}/src/utils/cutils/utils_regex.c -@@ -66,13 +66,22 @@ add_library(${LIB_ISULAD_IMG} ${LIBTYPE} - ${CMAKE_SOURCE_DIR}/src/utils/sha256/sha256.c - ${CMAKE_SOURCE_DIR}/src/utils/buffer/buffer.c - ${CMAKE_SOURCE_DIR}/src/daemon/common/err_msg.c -- ${CMAKE_SOURCE_DIR}/src/daemon/common/selinux_label.c - ${CMAKE_SOURCE_DIR}/src/daemon/common/sysinfo.c - ${CMAKE_SOURCE_DIR}/src/utils/tar/isulad_tar.c - ${CMAKE_SOURCE_DIR}/src/utils/tar/util_archive.c - ${CMAKE_SOURCE_DIR}/src/utils/tar/util_gzip.c - ) - -+if (ENABLE_SELINUX) -+ list(APPEND ISULAD_IMG_SRCS -+ ${CMAKE_SOURCE_DIR}/src/daemon/common/selinux_label.c -+ ) -+endif() -+ -+add_library(${LIB_ISULAD_IMG} ${LIBTYPE} -+ ${ISULAD_IMG_SRCS} -+ ) -+ - target_include_directories(${LIB_ISULAD_IMG} PUBLIC - ${local_image_incs} - ${CMAKE_SOURCE_DIR}/src/daemon/modules/api diff --git a/meta-openeuler/recipes-core/iSulad/iSulad/0002-delete-call-setlocale.patch b/meta-openeuler/recipes-core/iSulad/iSulad/0002-delete-call-setlocale.patch deleted file mode 100644 index 016d66b8529d31221ab17e40029909c07957eb5c..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-core/iSulad/iSulad/0002-delete-call-setlocale.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/cmd/isula/main.c b/src/cmd/isula/main.c -index a69df5d..476750a 100644 ---- a/src/cmd/isula/main.c -+++ b/src/cmd/isula/main.c -@@ -206,7 +206,7 @@ struct command g_commands[] = { - static int set_locale() - { - int ret = 0; -- -+ return ret; - /* Change from the standard (C) to en_US.UTF-8 locale, so libarchive can handle filename conversions.*/ - if (setlocale(LC_CTYPE, "en_US.UTF-8") == NULL) { - fprintf(stderr, "Could not set locale to en_US.UTF-8:%s", strerror(errno)); -diff --git a/src/cmd/isulad/main.c b/src/cmd/isulad/main.c -index 47bd6e2..fa5e6f7 100644 ---- a/src/cmd/isulad/main.c -+++ b/src/cmd/isulad/main.c -@@ -1446,7 +1446,7 @@ out: - static int set_locale() - { - int ret = 0; -- -+ return ret; - /* Change from the standard (C) to en_US.UTF-8 locale, so libarchive can handle filename conversions.*/ - if (setlocale(LC_CTYPE, "en_US.UTF-8") == NULL) { - COMMAND_ERROR("Could not set locale to en_US.UTF-8:%s", strerror(errno)); diff --git a/meta-openeuler/recipes-core/iSulad/iSulad/0003-modify-printf-to-arm32.patch b/meta-openeuler/recipes-core/iSulad/iSulad/0003-modify-printf-to-arm32.patch deleted file mode 100644 index 7d3947be0d7af9b7134ffabe5cd1051ab7609437..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-core/iSulad/iSulad/0003-modify-printf-to-arm32.patch +++ /dev/null @@ -1,208 +0,0 @@ -commit 5c290cec5e0022eb81e082ebcbc3bbcdf4f9807d -Author: lisimin -Date: Wed Sep 22 10:05:34 2021 +0800 - - modify printf to arm32 - - Signed-off-by: lisimin - -diff --git a/src/cmd/isula/extend/stats.c b/src/cmd/isula/extend/stats.c -index b35156a..8fd23a7 100644 ---- a/src/cmd/isula/extend/stats.c -+++ b/src/cmd/isula/extend/stats.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - #include "client_arguments.h" - #include "utils.h" -@@ -169,7 +170,7 @@ static void stats_print_original_data(const struct isula_container_info *stats) - short_id[SHORTIDLEN] = '\0'; - } - -- printf("%-16s %-10llu %-10s %-20lu %-20lu %-15u %-15lu %-15lu %-15lu %-15lu %-15lu %-15lu %-40s", short_id, -+ printf("%-16s %-10llu %-10s %-20"PRIu64" %-20"PRIu64" %-15u %-15"PRIu64" %-15"PRIu64" %-15"PRIu64" %-15"PRIu64" %-15"PRIu64" %-15"PRIu64" %-40s", short_id, - (unsigned long long)stats->pids_current, stats->status, stats->cpu_use_nanos, stats->cpu_system_use, - stats->online_cpus, stats->blkio_read, stats->blkio_write, stats->mem_used, stats->mem_limit, - stats->kmem_used, stats->cache, stats->name); -diff --git a/src/cmd/isulad/isulad_commands.c b/src/cmd/isulad/isulad_commands.c -index d0ab029..8df1dbc 100644 ---- a/src/cmd/isulad/isulad_commands.c -+++ b/src/cmd/isulad/isulad_commands.c -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - - #include "config.h" - #include "isula_libutils/log.h" -@@ -250,7 +251,7 @@ static int check_args_log_conf(const struct service_arguments *args) - /* validate max-size */ - if ((args->json_confs->log_driver && strcasecmp("file", args->json_confs->log_driver) == 0) && - (args->max_size < (4 * 1024))) { -- ERROR("Max-size \"%ld\" must large than 4KB.", args->max_size); -+ ERROR("Max-size \"%"PRId64"\" must large than 4KB.", args->max_size); - ret = -1; - goto out; - } -diff --git a/src/daemon/executor/container_cb/execution_stream.c b/src/daemon/executor/container_cb/execution_stream.c -index 7d165fb..c83162f 100644 ---- a/src/daemon/executor/container_cb/execution_stream.c -+++ b/src/daemon/executor/container_cb/execution_stream.c -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - #include "isula_libutils/log.h" - #include "io_wrapper.h" -@@ -1622,7 +1623,7 @@ static int container_logs_cb(const struct isulad_logs_request *request, stream_f - goto out; - } - -- EVENT("Event: {Object: %s, Content: path: %s, rotate: %d, size: %ld }", id, log_config->path, log_config->rotate, -+ EVENT("Event: {Object: %s, Content: path: %s, rotate: %d, size: %"PRId64" }", id, log_config->path, log_config->rotate, - log_config->size); - - nret = check_log_config(log_config); -diff --git a/src/daemon/executor/container_cb/list.c b/src/daemon/executor/container_cb/list.c -index d8f2632..fee7d23 100644 ---- a/src/daemon/executor/container_cb/list.c -+++ b/src/daemon/executor/container_cb/list.c -@@ -620,7 +620,7 @@ static int pack_list_containers(char **idsarray, const struct list_context *ctx, - } - - if (container_nums > (SIZE_MAX / sizeof(container_container *))) { -- ERROR("Get too many containers:%ld", container_nums); -+ ERROR("Get too many containers: %zu", container_nums); - ret = -1; - goto out; - } -diff --git a/src/daemon/modules/log/log_gather.c b/src/daemon/modules/log/log_gather.c -index b981391..2c42f84 100644 ---- a/src/daemon/modules/log/log_gather.c -+++ b/src/daemon/modules/log/log_gather.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #include "log_gather_api.h" - #include "isula_libutils/log.h" -@@ -223,7 +224,7 @@ static int check_log_file() - if (ret != 0) { - COMMAND_ERROR("Rotate log file %s failed.", g_log_file); - } else { -- INFO("Log file large than %lu, rotate it.", g_max_size); -+ INFO("Log file large than %"PRId64", rotate it.", g_max_size); - } - } else { - ret = 0; -diff --git a/src/daemon/modules/plugin/plugin.c b/src/daemon/modules/plugin/plugin.c -index 2532656..20ce4ec 100644 ---- a/src/daemon/modules/plugin/plugin.c -+++ b/src/daemon/modules/plugin/plugin.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #include "isula_libutils/log.h" - #include "plugin_api.h" -@@ -519,7 +520,7 @@ static int pm_register_plugin(const char *name, const char *addr) - goto failed; - } - -- INFO("add activated plugin %s 0x%lx", plugin->name, plugin->manifest->watch_event); -+ INFO("add activated plugin %s %"PRIu64"", plugin->name, plugin->manifest->watch_event); - return 0; - - failed: -@@ -854,7 +855,7 @@ bool plugin_is_watching(plugin_t *plugin, uint64_t pe) - } - plugin_unlock(plugin); - -- INFO("plugin %s watching=%s for event 0x%lx", plugin->name, (ok ? "true" : "false"), pe); -+ INFO("plugin %s watching=%s for event %"PRIu64"", plugin->name, (ok ? "true" : "false"), pe); - - return ok; - } -@@ -885,7 +886,7 @@ static int unpack_activate_response(const struct parsed_http_message *message, v - goto out; - } - -- INFO("get resp 0x%lx", resp->watch_event); -+ INFO("get resp %"PRIu64"", resp->watch_event); - manifest->init_type = resp->init_type; - manifest->watch_event = resp->watch_event; - -@@ -1371,7 +1372,7 @@ static int plugin_event_handle_dispath_impl(const char *cid, const char *plugins - ret = plugin_event_post_remove_handle(plugin, cid); - break; - default: -- ERROR("plugin event %ld not support.", pe); -+ ERROR("plugin event %"PRIu64" not support.", pe); - ret = -1; - break; - } -diff --git a/src/daemon/modules/spec/verify.c b/src/daemon/modules/spec/verify.c -index 57501cd..42300b6 100644 ---- a/src/daemon/modules/spec/verify.c -+++ b/src/daemon/modules/spec/verify.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - #include "constants.h" - #include "err_msg.h" -@@ -962,7 +963,7 @@ static bool check_hugetlbs_repeated(size_t newlen, const char *pagesize, - - for (j = 0; j < newlen; j++) { - if (newtlb[j] != NULL && newtlb[j]->page_size != NULL && !strcmp(newtlb[j]->page_size, pagesize)) { -- WARN("hugetlb-limit setting of %s is repeated, former setting %lu will be replaced with %lu", pagesize, -+ WARN("hugetlb-limit setting of %s is repeated, former setting %"PRIu64" will be replaced with %"PRIu64"", pagesize, - newtlb[j]->limit, hugetlb->limit); - newtlb[j]->limit = hugetlb->limit; - repeated = true; -@@ -1090,9 +1091,9 @@ static int verify_resources_device(defs_resources *resources) - - for (i = 0; i < resources->devices_len; i++) { - if (!util_valid_device_mode(resources->devices[i]->access)) { -- ERROR("Invalid device mode \"%s\" for device \"%ld %ld\"", resources->devices[i]->access, -+ ERROR("Invalid device mode \"%s\" for device \"%"PRId64" %"PRId64"\"", resources->devices[i]->access, - resources->devices[i]->major, resources->devices[i]->minor); -- isulad_set_error_message("Invalid device mode \"%s\" for device \"%ld %ld\"", resources->devices[i]->access, -+ isulad_set_error_message("Invalid device mode \"%s\" for device \"%"PRId64" %"PRId64"\"", resources->devices[i]->access, - resources->devices[i]->major, resources->devices[i]->minor); - ret = -1; - goto out; -@@ -1678,7 +1679,7 @@ static int add_hugetbl_element(host_config_hugetlbs_element ***hugetlb, size_t * - for (j = 0; j < *len; j++) { - if (strcmp((*hugetlb)[j]->page_size, pagesize) == 0) { - WARN("Hostconfig: hugetlb-limit setting of %s is repeated, " -- "former setting %lu will be replaced with %lu", -+ "former setting %"PRIu64" will be replaced with %"PRIu64"", - pagesize, (*hugetlb)[j]->limit, element->limit); - (*hugetlb)[j]->limit = element->limit; - goto out; -diff --git a/src/utils/cutils/utils_base64.c b/src/utils/cutils/utils_base64.c -index 2eb6b6b..aebf097 100644 ---- a/src/utils/cutils/utils_base64.c -+++ b/src/utils/cutils/utils_base64.c -@@ -115,7 +115,7 @@ size_t util_base64_decode_len(const char *input, size_t len) - size_t padding_count = 0; - - if (input == NULL || len < 4 || len % 4 != 0) { -- ERROR("Invalid param for base64 decode length, length is %ld", len); -+ ERROR("Invalid param for base64 decode length, length is %zu ", len); - return -1; - } - diff --git a/meta-openeuler/recipes-core/iSulad/iSulad/0004-deamon-do-not-support-attach-and-pause.patch b/meta-openeuler/recipes-core/iSulad/iSulad/0004-deamon-do-not-support-attach-and-pause.patch deleted file mode 100644 index fd79536eba31230f3123855a6518a51c98184be8..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-core/iSulad/iSulad/0004-deamon-do-not-support-attach-and-pause.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 6a691ebaed9ecee727623d677501956500f86576 Mon Sep 17 00:00:00 2001 -From: lisimin -Date: Sun, 26 Sep 2021 17:07:32 +0800 -Subject: [PATCH] deamon do not support attach and pause - -Signed-off-by: lisimin ---- - src/cmd/isula/main.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/cmd/isula/main.c b/src/cmd/isula/main.c -index 476750a..e1eff2b 100644 ---- a/src/cmd/isula/main.c -+++ b/src/cmd/isula/main.c -@@ -86,6 +86,7 @@ struct command g_commands[] = { - // `inspect` sub-command - "inspect", false, cmd_inspect_main, g_cmd_inspect_desc, NULL, &g_cmd_inspect_args - }, -+#ifdef GRPC_CONNECTOR - { - // `pause` sub-command - "pause", false, cmd_pause_main, g_cmd_pause_desc, NULL, &g_cmd_pause_args -@@ -94,6 +95,7 @@ struct command g_commands[] = { - // `unpause` sub-command - "unpause", false, cmd_resume_main, g_cmd_resume_desc, NULL, &g_cmd_resume_args - }, -+#endif - #ifdef ENABLE_OCI_IMAGE - { - // `stats` sub-command -@@ -158,10 +160,12 @@ struct command g_commands[] = { - "update", false, cmd_update_main, g_cmd_update_desc, NULL, &g_cmd_update_args - }, - #endif -+#ifdef GRPC_CONNECTOR - { - // `attach` sub-command - "attach", false, cmd_attach_main, g_cmd_attach_desc, NULL, &g_cmd_attach_args - }, -+#endif - #ifdef ENABLE_OCI_IMAGE - { - // `export` sub-command --- -2.16.4 - diff --git a/meta-openeuler/recipes-core/iSulad/iSulad/0005-fix-exec-30s-exit.patch b/meta-openeuler/recipes-core/iSulad/iSulad/0005-fix-exec-30s-exit.patch deleted file mode 100644 index 76a79ee04b67713d56a2c17afffbe51598a40492..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-core/iSulad/iSulad/0005-fix-exec-30s-exit.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 17355d674552731da40d80855ad2c50db3d60f25 Mon Sep 17 00:00:00 2001 -From: lisimin -Date: Sun, 26 Sep 2021 20:05:54 +0800 -Subject: [PATCH] fix exec 30s exit - -Signed-off-by: lisimin ---- - src/utils/http/http.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/utils/http/http.c b/src/utils/http/http.c -index 0dcbcd5..72f9c9e 100644 ---- a/src/utils/http/http.c -+++ b/src/utils/http/http.c -@@ -424,8 +424,6 @@ int http_request(const char *url, struct http_get_options *options, long *respon - /* complete connection within 30 seconds */ - curl_easy_setopt(curl_handle, CURLOPT_CONNECTTIMEOUT, 30L); - /* if less than 1k data is received in 30s, abort */ -- curl_easy_setopt(curl_handle, CURLOPT_LOW_SPEED_LIMIT, 1024L); -- curl_easy_setopt(curl_handle, CURLOPT_LOW_SPEED_TIME, 30L); - /* provide a buffer to store errors in */ - curl_easy_setopt(curl_handle, CURLOPT_ERRORBUFFER, errbuf); - curl_easy_setopt(curl_handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); --- -2.16.4 - diff --git a/meta-openeuler/recipes-core/iSulad/iSulad_2.0.10.bb b/meta-openeuler/recipes-core/iSulad/iSulad_2.0.11.bb similarity index 44% rename from meta-openeuler/recipes-core/iSulad/iSulad_2.0.10.bb rename to meta-openeuler/recipes-core/iSulad/iSulad_2.0.11.bb index c93f9ad5567343ef421b2361291ece033bff68ce..a43d39ed8285263ccabcbc556164208f446c225c 100644 --- a/meta-openeuler/recipes-core/iSulad/iSulad_2.0.10.bb +++ b/meta-openeuler/recipes-core/iSulad/iSulad_2.0.11.bb @@ -3,31 +3,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI = "file://iSulad/v2.0.10.tar.gz \ - file://0001-fix-bug-disable-selinux-not-selinux-label-file.patch \ - file://0002-delete-call-setlocale.patch \ - file://0003-modify-printf-to-arm32.patch \ - file://0004-deamon-do-not-support-attach-and-pause.patch \ - file://0005-fix-exec-30s-exit.patch \ - file://iSulad/0002-fix-memleak-when-use-multiple-volumes-from.patch \ - file://iSulad/0005-delete-isulad-h-flag.patch \ - file://iSulad/0006-Fix-memory-leak-in-ClearCniNetwork-when-calling-get_.patch \ - file://iSulad/0007-fix-cri-libwebsockets-sync_close_sem-memory-leak.patch \ - file://iSulad/0008-fix-cpu-variant-get-error.patch \ - file://iSulad/0009-fix-unit-test-error-of-registry-in-armv8.patch \ - file://iSulad/0010-Modified-cmakelist-of-storage_layer-and-added-a-new-.patch \ - file://iSulad/0011-add-fuzz-build-in-CI.patch \ - file://iSulad/0012-print-valgrind-log.patch \ - file://iSulad/0013-fix-cri-version-memory-leak.patch \ - file://iSulad/0014-fix-undefined-reference-in-libisulad_img.so.patch \ - file://iSulad/0015-fix-undefined-reference-to-service_arguments_free-in.patch \ - file://iSulad/0016-fix-mem-leak.patch \ - file://iSulad/0017-isula-pull-does-not-support-format-name-digest.patch \ - file://iSulad/0019-add-pull-request-gateway-checker-for-build-and-ut.patch \ - file://iSulad/0020-Optimize-websocket-streaming-service-code.patch \ +SRC_URI = "file://iSulad/v${PV}.tar.gz \ " -S = "${WORKDIR}/${BPN}" +S = "${WORKDIR}/${BPN}-v${PV}" WARN_QA_remove += "uppercase-pn" inherit cmake diff --git a/meta-openeuler/recipes-core/lcr/lcr_2.0.6.bb b/meta-openeuler/recipes-core/lcr/lcr_2.0.7.bb similarity index 68% rename from meta-openeuler/recipes-core/lcr/lcr_2.0.6.bb rename to meta-openeuler/recipes-core/lcr/lcr_2.0.7.bb index 7fbbfe11dcbb5a8c5059abfae10061826b2336d2..54464295490057866f2e1240730ec23bb9cd960c 100644 --- a/meta-openeuler/recipes-core/lcr/lcr_2.0.6.bb +++ b/meta-openeuler/recipes-core/lcr/lcr_2.0.7.bb @@ -3,7 +3,6 @@ SUMMARY = "lcr(Lightweight Container Runtime)" DESCRIPTION = "lcr`(Lightweight Container Runtime) is CLI tool for spawning and running containers according to \ OCI specification. It is based on `liblxc` and written by `C`. It can use by container engine: \ iSulad" -AUTHOR = "" HOMEPAGE = "https://gitee.com/openeuler/lcr" BUGTRACKER = "https://gitee.com/openeuler/yocto-meta-openeuler" @@ -15,17 +14,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;m inherit cmake ### Build metadata -SRC_URI = "file://lcr/v2.0.6.tar.gz \ - file://lcr/0001-modified-ipconfig.json-to-adapt-to-newest-version-of.patch \ - file://lcr/0002-disable-lxc_keep-with-oci-image.patch \ - file://lcr/0003-add-self-def-runtime-for-shimv2.patch \ - file://lcr/0004-move-cri-runtimes-to-daemon.patch \ - file://lcr/0005-config-v2-and-inspect-were-modified-to-support-modif.patch \ - file://lcr/0006-support-null-value-in-json.patch \ - file://lcr/0007-fix-the-error-of-gcc-compilation-optimization-level.patch \ +SRC_URI = "file://lcr/v${PV}.tar.gz \ " -S = "${WORKDIR}/${BPN}" +S = "${WORKDIR}/${BPN}-v${PV}" OECMAKE_GENERATOR = "Unix Makefiles"