fix compilation errors without libcap

Signed-off-by: wujing <wujing50@huawei.com>
This commit is contained in:
wujing 2021-01-05 17:07:03 +08:00
parent 4435877538
commit 769928caf4
3 changed files with 41 additions and 1 deletions

View File

@ -0,0 +1,32 @@
From 5a3bec3f80d59dfcc76e16cbab957f4072601816 Mon Sep 17 00:00:00 2001
From: wujing <wujing50@huawei.com>
Date: Tue, 5 Jan 2021 16:53:40 +0800
Subject: [PATCH] fix compilation errors without libcap
Signed-off-by: wujing <wujing50@huawei.com>
---
src/lxc/conf.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index c3610ae3..19e193dd 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -5301,11 +5301,12 @@ int lxc_drop_caps(struct lxc_conf *conf)
goto out;
}
-#endif
-
out:
free(caplist);
return ret;
+#else
+ return 0;
+#endif
}
#endif
--
2.27.0

View File

@ -1,4 +1,4 @@
%global _release 2020122401 %global _release 2021010501
Name: lxc Name: lxc
Version: 4.0.3 Version: 4.0.3
@ -24,6 +24,7 @@ Patch0013: 0013-use-path-based-unix-domain-sockets-instead-of-abstra.patch
Patch0014: 0014-api-add-get-container-metrics-api.patch Patch0014: 0014-api-add-get-container-metrics-api.patch
Patch0015: 0015-Streaming-IO-solution-optimization-and-enhancement.patch Patch0015: 0015-Streaming-IO-solution-optimization-and-enhancement.patch
Patch0016: 0016-avoid-using-void-pointers-in-caclulation.patch Patch0016: 0016-avoid-using-void-pointers-in-caclulation.patch
Patch0017: 0017-fix-compilation-errors-without-libcap.patch
BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath
BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libseccomp)
@ -195,6 +196,12 @@ make check
%{_mandir}/*/man7/%{name}* %{_mandir}/*/man7/%{name}*
%changelog %changelog
* Tue Jan 2021 wujing <wujing50@huawei.com> - 4.0.3-2021010501
- Type:enhancement
- ID:NA
- SUG:NA
- DESC: fix compilation errors without libcap
* Thu Dec 24 2020 wujing <wujing50@huawei.com> - 4.0.3-2020122401 * Thu Dec 24 2020 wujing <wujing50@huawei.com> - 4.0.3-2020122401
- Type:enhancement - Type:enhancement
- ID:NA - ID:NA

View File

@ -14,3 +14,4 @@
0014-api-add-get-container-metrics-api.patch 0014-api-add-get-container-metrics-api.patch
0015-Streaming-IO-solution-optimization-and-enhancement.patch 0015-Streaming-IO-solution-optimization-and-enhancement.patch
0016-avoid-using-void-pointers-in-caclulation.patch 0016-avoid-using-void-pointers-in-caclulation.patch
0017-fix-compilation-errors-without-libcap.patch