63 lines
2.6 KiB
Diff
63 lines
2.6 KiB
Diff
|
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
|
||
|
|
|