diff options
| author | CoprDistGit <infra@openeuler.org> | 2023-04-17 07:36:31 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2023-04-17 07:36:31 +0000 |
| commit | 5de4bc645d087edfbc848d43ac0019a6535a3c73 (patch) | |
| tree | 7354cf7f0504f1020c7c3165c77c21ef9257cbb4 /0035-fix-compile-error-when-not-enable-remote-ro.patch | |
| parent | 4a79e40e226e2077b5e8cc274610e473b148f507 (diff) | |
automatic import of iSuladopeneuler20.03
Diffstat (limited to '0035-fix-compile-error-when-not-enable-remote-ro.patch')
| -rw-r--r-- | 0035-fix-compile-error-when-not-enable-remote-ro.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/0035-fix-compile-error-when-not-enable-remote-ro.patch b/0035-fix-compile-error-when-not-enable-remote-ro.patch new file mode 100644 index 0000000..091c939 --- /dev/null +++ b/0035-fix-compile-error-when-not-enable-remote-ro.patch @@ -0,0 +1,62 @@ +From 6a0b11ae6584ee2eefff9bd20c96bc60582ccb6b Mon Sep 17 00:00:00 2001 +From: "Neil.wrz" <wangrunze13@huawei.com> +Date: Sun, 5 Mar 2023 18:55:40 -0800 +Subject: [PATCH 35/53] fix compile error when not enable remote ro + +Signed-off-by: Neil.wrz <wangrunze13@huawei.com> +--- + .../modules/image/oci/storage/image_store/CMakeLists.txt | 3 +++ + .../modules/image/oci/storage/layer_store/CMakeLists.txt | 4 ++++ + .../storage/layer_store/graphdriver/overlay2/CMakeLists.txt | 3 +++ + 3 files changed, 10 insertions(+) + +diff --git a/src/daemon/modules/image/oci/storage/image_store/CMakeLists.txt b/src/daemon/modules/image/oci/storage/image_store/CMakeLists.txt +index ecf21caa..7d4fb77c 100644 +--- a/src/daemon/modules/image/oci/storage/image_store/CMakeLists.txt ++++ b/src/daemon/modules/image/oci/storage/image_store/CMakeLists.txt +@@ -1,5 +1,8 @@ + # get current directory sources files + aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} local_image_store_srcs) ++IF (NOT ENABLE_REMOTE_LAYER_STORE) ++list(REMOVE_ITEM local_image_store_srcs "${CMAKE_CURRENT_SOURCE_DIR}/image_remote_impl.c") ++ENDIF() + + set(IMAGE_STORE_SRCS + ${local_image_store_srcs} +diff --git a/src/daemon/modules/image/oci/storage/layer_store/CMakeLists.txt b/src/daemon/modules/image/oci/storage/layer_store/CMakeLists.txt +index f964f709..e04b4ad7 100644 +--- a/src/daemon/modules/image/oci/storage/layer_store/CMakeLists.txt ++++ b/src/daemon/modules/image/oci/storage/layer_store/CMakeLists.txt +@@ -1,5 +1,8 @@ + # get current directory sources files + aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} local_layer_store_srcs) ++IF (NOT ENABLE_REMOTE_LAYER_STORE) ++list(REMOVE_ITEM local_layer_store_srcs "${CMAKE_CURRENT_SOURCE_DIR}/layer_remote_impl.c") ++ENDIF() + add_subdirectory(graphdriver) + + set(LAYER_STORE_SRCS +@@ -7,6 +10,7 @@ set(LAYER_STORE_SRCS + ${GRAPHDRIVER_SRCS} + PARENT_SCOPE + ) ++ + set(LAYER_STORE_INCS + ${CMAKE_CURRENT_SOURCE_DIR} + ${GRAPHDRIVER_INCS} +diff --git a/src/daemon/modules/image/oci/storage/layer_store/graphdriver/overlay2/CMakeLists.txt b/src/daemon/modules/image/oci/storage/layer_store/graphdriver/overlay2/CMakeLists.txt +index ceed16b7..dd4e82aa 100644 +--- a/src/daemon/modules/image/oci/storage/layer_store/graphdriver/overlay2/CMakeLists.txt ++++ b/src/daemon/modules/image/oci/storage/layer_store/graphdriver/overlay2/CMakeLists.txt +@@ -1,5 +1,8 @@ + # get current directory sources files + aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} local_overlay2_srcs) ++IF (NOT ENABLE_REMOTE_LAYER_STORE) ++list(REMOVE_ITEM local_overlay2_srcs "${CMAKE_CURRENT_SOURCE_DIR}/overlay_remote_impl.c") ++ENDIF() + + set(OVERLAY2_SRCS + ${local_overlay2_srcs} +-- +2.25.1 + |