!245 fix compile error of isula-transform
Merge pull request !245 from wangfengtu/src-transform
This commit is contained in:
commit
e3fbb3ba1a
35
0026-fix-compile-error-of-isula-transform.patch
Normal file
35
0026-fix-compile-error-of-isula-transform.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
From b13bdf63b048f49e2e269737073e8f5b894cd3aa Mon Sep 17 00:00:00 2001
|
||||||
|
From: WangFengTu <wangfengtu@huawei.com>
|
||||||
|
Date: Wed, 12 Jan 2022 14:16:41 +0800
|
||||||
|
Subject: [PATCH] fix compile error of isula-transform
|
||||||
|
|
||||||
|
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
|
||||||
|
---
|
||||||
|
src/daemon/modules/image/CMakeLists.txt | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/daemon/modules/image/CMakeLists.txt b/src/daemon/modules/image/CMakeLists.txt
|
||||||
|
index bfab0334..315014d6 100644
|
||||||
|
--- a/src/daemon/modules/image/CMakeLists.txt
|
||||||
|
+++ b/src/daemon/modules/image/CMakeLists.txt
|
||||||
|
@@ -72,7 +72,7 @@ set(LIB_ISULAD_IMG_SRCS
|
||||||
|
${CMAKE_SOURCE_DIR}/src/daemon/config/daemon_arguments.c
|
||||||
|
)
|
||||||
|
|
||||||
|
-if (ENALBE_SELINUX)
|
||||||
|
+if (ENABLE_SELINUX)
|
||||||
|
list(APPEND LIB_ISULAD_IMG_SRCS
|
||||||
|
${CMAKE_SOURCE_DIR}/src/daemon/common/selinux_label.c
|
||||||
|
)
|
||||||
|
@@ -121,7 +121,7 @@ if (ENABLE_OCI_IMAGE)
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
-if (ENALBE_SELINUX)
|
||||||
|
+if (ENABLE_SELINUX)
|
||||||
|
target_link_libraries(${LIB_ISULAD_IMG}
|
||||||
|
${SELINUX_LIBRARY}
|
||||||
|
)
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
@ -1,5 +1,5 @@
|
|||||||
%global _version 2.0.10
|
%global _version 2.0.10
|
||||||
%global _release 14
|
%global _release 15
|
||||||
%global is_systemd 1
|
%global is_systemd 1
|
||||||
%global enable_shimv2 1
|
%global enable_shimv2 1
|
||||||
%global is_embedded 1
|
%global is_embedded 1
|
||||||
@ -38,6 +38,7 @@ Patch0022: 0022-fix-memory-leak-in-CniNetworkPlugin.patch
|
|||||||
Patch0023: 0023-fix-codex-error.patch
|
Patch0023: 0023-fix-codex-error.patch
|
||||||
Patch0024: 0024-fix-compile-error-when-building-embedded-image.patch
|
Patch0024: 0024-fix-compile-error-when-building-embedded-image.patch
|
||||||
Patch0025: 0025-fix-compile-error-with-grpc-1.41.x.patch
|
Patch0025: 0025-fix-compile-error-with-grpc-1.41.x.patch
|
||||||
|
Patch0026: 0026-fix-compile-error-of-isula-transform.patch
|
||||||
|
|
||||||
%ifarch x86_64 aarch64
|
%ifarch x86_64 aarch64
|
||||||
Provides: libhttpclient.so()(64bit)
|
Provides: libhttpclient.so()(64bit)
|
||||||
@ -262,6 +263,12 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jan 12 2022 wangfengtu <wangfengtu@huawei.com> - 2.0.10-15
|
||||||
|
- Type: bugfix
|
||||||
|
- ID: NA
|
||||||
|
- SUG: NA
|
||||||
|
- DESC: fix compile error of isula-transform
|
||||||
|
|
||||||
* Wed Jan 12 2022 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 2.0.10-14
|
* Wed Jan 12 2022 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 2.0.10-14
|
||||||
- Type: bugfix
|
- Type: bugfix
|
||||||
- ID: NA
|
- ID: NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user