From 864d93b9c8289bdad1e0751acff8eb67e53859b4 Mon Sep 17 00:00:00 2001 From: zhangxiaoyu Date: Tue, 8 Sep 2020 19:47:35 +0800 Subject: [PATCH] iSulad: add LIB_ISULAD_IMG_SO for libisulad_img.so to avoid func do_integration_of_images_check() Signed-off-by: zhangxiaoyu --- src/daemon/modules/image/CMakeLists.txt | 2 ++ src/daemon/modules/image/oci/oci_image.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/daemon/modules/image/CMakeLists.txt b/src/daemon/modules/image/CMakeLists.txt index a4d569e..a92799a 100644 --- a/src/daemon/modules/image/CMakeLists.txt +++ b/src/daemon/modules/image/CMakeLists.txt @@ -100,5 +100,7 @@ target_link_libraries(${LIB_ISULAD_IMG} ${SELINUX_LIBRARY} -lpthread -lcrypto -larchive -lz libhttpclient) +target_compile_definitions(${LIB_ISULAD_IMG} PRIVATE LIB_ISULAD_IMG_SO) + install(TARGETS ${LIB_ISULAD_IMG} LIBRARY DESTINATION ${LIB_INSTALL_DIR_DEFAULT} PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE) diff --git a/src/daemon/modules/image/oci/oci_image.c b/src/daemon/modules/image/oci/oci_image.c index b9331c3..f9661b6 100644 --- a/src/daemon/modules/image/oci/oci_image.c +++ b/src/daemon/modules/image/oci/oci_image.c @@ -53,6 +53,7 @@ static char *format_driver_name(const char *driver) } } +#ifndef LIB_ISULAD_IMG_SO static int do_integration_of_images_check(bool image_layer_check, struct storage_module_init_options *opts) { char *check_file = NULL; @@ -89,6 +90,7 @@ out: free(check_file); return ret; } +#endif // LIB_ISULAD_IMG_SO static int storage_module_init_helper(const isulad_daemon_configs *args) { @@ -130,10 +132,12 @@ static int storage_module_init_helper(const isulad_daemon_configs *args) goto out; } +#ifndef LIB_ISULAD_IMG_SO if (do_integration_of_images_check(args->image_layer_check, storage_opts) != 0) { ret = -1; goto out; } +#endif // LIB_ISULAD_IMG_SO if (storage_module_init(storage_opts) != 0) { ERROR("Failed to init storage module"); -- GitLab