packages/lxc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add header to fix compile error with have isulad

Browse Source 
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
This commit is contained in:
zhangxiaoyu 2022-07-21 20:34:38 +08:00
parent d9cd0481fa
commit 2b343ef662
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
0001-refactor-patch-code-of-utils-commands-and-so-on.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
src/lxc/commands.h | 10 + src/lxc/commands.h | 10 +
src/lxc/conf.h | 95 ++++ src/lxc/conf.h | 95 ++++
src/lxc/isulad_utils.c | 319 +++++++++++++ src/lxc/isulad_utils.c | 319 +++++++++++++
src/lxc/isulad_utils.h | 98 ++++ src/lxc/isulad_utils.h | 99 ++++
src/lxc/lsm/lsm.c | 20 + src/lxc/lsm/lsm.c | 20 +
src/lxc/lxc.h | 19 + src/lxc/lxc.h | 19 +
src/lxc/lxccontainer.h | 194 ++++++++ src/lxc/lxccontainer.h | 194 ++++++++
@ -19,7 +19,7 @@ Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
src/lxc/tools/lxc_start.c | 109 ++++- src/lxc/tools/lxc_start.c | 109 ++++-
src/lxc/utils.c | 173 +++++++ src/lxc/utils.c | 173 +++++++
src/lxc/utils.h | 11 + src/lxc/utils.h | 11 +
14 files changed, 1821 insertions(+), 3 deletions(-) 14 files changed, 1822 insertions(+), 3 deletions(-)
create mode 100644 src/lxc/cgroups/isulad_cgroup2_devices.c create mode 100644 src/lxc/cgroups/isulad_cgroup2_devices.c
create mode 100644 src/lxc/isulad_utils.c create mode 100644 src/lxc/isulad_utils.c
create mode 100644 src/lxc/isulad_utils.h create mode 100644 src/lxc/isulad_utils.h
@ -1372,10 +1372,10 @@ index 0000000..15d9323
+} +}
diff --git a/src/lxc/isulad_utils.h b/src/lxc/isulad_utils.h diff --git a/src/lxc/isulad_utils.h b/src/lxc/isulad_utils.h
new file mode 100644 new file mode 100644
index 0000000..7436c40 index 0000000..345f511
--- /dev/null --- /dev/null
+++ b/src/lxc/isulad_utils.h +++ b/src/lxc/isulad_utils.h
@@ -0,0 +1,98 @@ @@ -0,0 +1,99 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1+ */
+/****************************************************************************** +/******************************************************************************
+ * Copyright (c) Huawei Technologies Co., Ltd. 2020. Allrights reserved + * Copyright (c) Huawei Technologies Co., Ltd. 2020. Allrights reserved
@ -1387,6 +1387,7 @@ index 0000000..7436c40
+#define __iSULAD_UTILS_H +#define __iSULAD_UTILS_H
+ +
+#include <stdio.h> +#include <stdio.h>
+#include <stdbool.h>
+ +
+/* isulad: replace space with SPACE_MAGIC_STR */ +/* isulad: replace space with SPACE_MAGIC_STR */
+#define SPACE_MAGIC_STR "[#)" +#define SPACE_MAGIC_STR "[#)"

12
lxc.spec
View File

@ -1,4 +1,4 @@
%global _release 2022072103 %global _release 2022072104
Name: lxc Name: lxc
Version: 4.0.3 Version: 4.0.3
@ -187,13 +187,19 @@ make check
%{_mandir}/*/man7/%{name}* %{_mandir}/*/man7/%{name}*
%changelog %changelog
* Thu Jul 21 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022072102 * Thu Jul 21 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022072104
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: add header to fix compile error with have isulad
* Thu Jul 21 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022072103
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA
- SUG:NA - SUG:NA
- DESC: fix compile error - DESC: fix compile error
* Thu Jul 21 2022 chengzeruizhi<chengzeruizhi@huawei.com> - 4.0.3-2022072101 * Thu Jul 21 2022 chengzeruizhi<chengzeruizhi@huawei.com> - 4.0.3-2022072102
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA
- SUG:NA - SUG:NA