From 15e3ead4ded2be09d08b58da611b5defe24e152c Mon Sep 17 00:00:00 2001 From: zhuyan Date: Sun, 26 Sep 2021 19:57:44 +0800 Subject: [PATCH] deamon do not support attach and pause Signed-off-by: dongxinhua Signed-off-by: zhuyan --- ...able-selinux-not-selinux-label-file.patch} | 0 ...patch => 0002-delete-call-setlocale.patch} | 0 ...atch => 0003-modify-printf-to-arm32.patch} | 0 ...amon-do-not-support-attach-and-pause.patch | 46 +++++++++++++++++++ .../recipes-core/iSulad/iSulad_2.0.9.bb | 7 +-- 5 files changed, 50 insertions(+), 3 deletions(-) rename meta-openeuler/recipes-core/iSulad/iSulad/{fix_bug_disable_selinux_not_selinux_label_file.patch => 0001-fix-bug-disable-selinux-not-selinux-label-file.patch} (100%) rename meta-openeuler/recipes-core/iSulad/iSulad/{delete_call_setlocale.patch => 0002-delete-call-setlocale.patch} (100%) rename meta-openeuler/recipes-core/iSulad/iSulad/{modify_printf_to_arm32.patch => 0003-modify-printf-to-arm32.patch} (100%) create mode 100644 meta-openeuler/recipes-core/iSulad/iSulad/0004-deamon-do-not-support-attach-and-pause.patch diff --git a/meta-openeuler/recipes-core/iSulad/iSulad/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 similarity index 100% rename from meta-openeuler/recipes-core/iSulad/iSulad/fix_bug_disable_selinux_not_selinux_label_file.patch rename to meta-openeuler/recipes-core/iSulad/iSulad/0001-fix-bug-disable-selinux-not-selinux-label-file.patch diff --git a/meta-openeuler/recipes-core/iSulad/iSulad/delete_call_setlocale.patch b/meta-openeuler/recipes-core/iSulad/iSulad/0002-delete-call-setlocale.patch similarity index 100% rename from meta-openeuler/recipes-core/iSulad/iSulad/delete_call_setlocale.patch rename to meta-openeuler/recipes-core/iSulad/iSulad/0002-delete-call-setlocale.patch diff --git a/meta-openeuler/recipes-core/iSulad/iSulad/modify_printf_to_arm32.patch b/meta-openeuler/recipes-core/iSulad/iSulad/0003-modify-printf-to-arm32.patch similarity index 100% rename from meta-openeuler/recipes-core/iSulad/iSulad/modify_printf_to_arm32.patch rename to meta-openeuler/recipes-core/iSulad/iSulad/0003-modify-printf-to-arm32.patch 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 new file mode 100644 index 00000000000..fd79536eba3 --- /dev/null +++ b/meta-openeuler/recipes-core/iSulad/iSulad/0004-deamon-do-not-support-attach-and-pause.patch @@ -0,0 +1,46 @@ +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_2.0.9.bb b/meta-openeuler/recipes-core/iSulad/iSulad_2.0.9.bb index 14a71b8665a..cc1ca675ba7 100644 --- a/meta-openeuler/recipes-core/iSulad/iSulad_2.0.9.bb +++ b/meta-openeuler/recipes-core/iSulad/iSulad_2.0.9.bb @@ -4,9 +4,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRC_URI = "file://iSulad/v2.0.9.tar.gz \ - file://fix_bug_disable_selinux_not_selinux_label_file.patch \ - file://delete_call_setlocale.patch \ - file://modify_printf_to_arm32.patch \ + 0001-fix-bug-disable-selinux-not-selinux-label-file.patch \ + 0002-delete-call-setlocale.patch \ + 0003-modify-printf-to-arm32.patch \ + 0004-deamon-do-not-support-attach-and-pause.patch \ " FILESPATH_prepend += "${LOCAL_FILES}/${BPN}:" -- Gitee