From a243a467302f2f9d0a68d00aac45ac2275b2c17d Mon Sep 17 00:00:00 2001 From: zhangxiaoyu Date: Thu, 21 Jul 2022 20:34:38 +0800 Subject: [PATCH] add header to fix compile error with have isulad Signed-off-by: zhangxiaoyu --- ...ctor-patch-code-of-utils-commands-and-so-on.patch | 9 +++++---- lxc.spec | 12 +++++++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/0001-refactor-patch-code-of-utils-commands-and-so-on.patch b/0001-refactor-patch-code-of-utils-commands-and-so-on.patch index 5c0cd7f..e39be2e 100644 --- a/0001-refactor-patch-code-of-utils-commands-and-so-on.patch +++ b/0001-refactor-patch-code-of-utils-commands-and-so-on.patch @@ -10,7 +10,7 @@ Signed-off-by: zhangxiaoyu src/lxc/commands.h | 10 + src/lxc/conf.h | 95 ++++ 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/lxc.h | 19 + src/lxc/lxccontainer.h | 194 ++++++++ @@ -19,7 +19,7 @@ Signed-off-by: zhangxiaoyu src/lxc/tools/lxc_start.c | 109 ++++- src/lxc/utils.c | 173 +++++++ 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/isulad_utils.c 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 new file mode 100644 -index 0000000..7436c40 +index 0000000..345f511 --- /dev/null +++ b/src/lxc/isulad_utils.h -@@ -0,0 +1,98 @@ +@@ -0,0 +1,99 @@ +/* SPDX-License-Identifier: LGPL-2.1+ */ +/****************************************************************************** + * Copyright (c) Huawei Technologies Co., Ltd. 2020. Allrights reserved @@ -1387,6 +1387,7 @@ index 0000000..7436c40 +#define __iSULAD_UTILS_H + +#include ++#include + +/* isulad: replace space with SPACE_MAGIC_STR */ +#define SPACE_MAGIC_STR "[#)" diff --git a/lxc.spec b/lxc.spec index 189f1de..e06e2b8 100644 --- a/lxc.spec +++ b/lxc.spec @@ -1,4 +1,4 @@ -%global _release 2022072103 +%global _release 2022072104 Name: lxc Version: 4.0.3 @@ -187,13 +187,19 @@ make check %{_mandir}/*/man7/%{name}* %changelog -* Thu Jul 21 2022 zhangxiaoyu - 4.0.3-2022072102 +* Thu Jul 21 2022 zhangxiaoyu - 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 - 4.0.3-2022072103 - Type:bugfix - ID:NA - SUG:NA - DESC: fix compile error -* Thu Jul 21 2022 chengzeruizhi - 4.0.3-2022072101 +* Thu Jul 21 2022 chengzeruizhi - 4.0.3-2022072102 - Type:bugfix - ID:NA - SUG:NA -- Gitee