45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From deb3e52ca981edb943fa77f2f2d5ef4ea2f6839a Mon Sep 17 00:00:00 2001
|
|
From: zhongtao <zhongtao17@huawei.com>
|
|
Date: Wed, 23 Aug 2023 16:39:14 +1400
|
|
Subject: [PATCH 07/10] clear author msg in isulad-check.sh and use
|
|
EANBLE_IMAGE_LIBARAY to isolate image_api.h
|
|
|
|
Signed-off-by: zhongtao <zhongtao17@huawei.com>
|
|
---
|
|
CMakeLists.txt | 6 ++++--
|
|
src/contrib/sysmonitor/isulad-check.sh | 1 -
|
|
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index d1ec1cc1..a22a3702 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -91,8 +91,10 @@ ENDIF(ENABLE_FUZZ AND (NOT ENABLE_UT))
|
|
# install all files
|
|
install(FILES ${CMAKE_BINARY_DIR}/conf/isulad.pc
|
|
DESTINATION ${LIB_INSTALL_DIR_DEFAULT}/pkgconfig PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE)
|
|
-install(FILES src/daemon/modules/api/image_api.h
|
|
- DESTINATION include/isulad)
|
|
+if (EANBLE_IMAGE_LIBARAY)
|
|
+ install(FILES src/daemon/modules/api/image_api.h
|
|
+ DESTINATION include/isulad)
|
|
+endif()
|
|
|
|
# install config files
|
|
set(conf_prefix "/etc")
|
|
diff --git a/src/contrib/sysmonitor/isulad-check.sh b/src/contrib/sysmonitor/isulad-check.sh
|
|
index 0df88a44..adb1700e 100755
|
|
--- a/src/contrib/sysmonitor/isulad-check.sh
|
|
+++ b/src/contrib/sysmonitor/isulad-check.sh
|
|
@@ -10,7 +10,6 @@
|
|
# - PURPOSE.
|
|
# - See the Mulan PSL v2 for more details.
|
|
##- @Description: isulad check
|
|
-##- @Author: maoweiyong
|
|
##- @Create: 2019-02-25
|
|
#######################################################################*/
|
|
|
|
--
|
|
2.25.1
|
|
|