From 473f2457ad9875c32cd703fb90f410e8c7390038 Mon Sep 17 00:00:00 2001 From: zhangxiaoyu Date: Fri, 22 Jul 2022 10:23:59 +0800 Subject: [PATCH] default set have_isulad false Signed-off-by: zhangxiaoyu --- 0009-default-set-have_isulad-false.patch | 28 ++++++++++++++++++++++++ lxc.spec | 12 ++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 0009-default-set-have_isulad-false.patch diff --git a/0009-default-set-have_isulad-false.patch b/0009-default-set-have_isulad-false.patch new file mode 100644 index 0000000..e38f7e6 --- /dev/null +++ b/0009-default-set-have_isulad-false.patch @@ -0,0 +1,28 @@ +From fabb0a37dfab7722fdc87162876fa5598026d162 Mon Sep 17 00:00:00 2001 +From: zhangxiaoyu +Date: Fri, 22 Jul 2022 10:17:30 +0800 +Subject: [PATCH] default set have_isulad false + +Signed-off-by: zhangxiaoyu +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ce8854e..51fb3e9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -833,8 +833,8 @@ fi + + AC_MSG_CHECKING([Whether adapt to iSulad]) + AC_ARG_ENABLE([isulad], +- [AC_HELP_STRING([--enable-isulad], [enable adapt to iSulad [default=yes]])], +- [adapt_isulad=$enableval], [adapt_isulad=yes]) ++ [AC_HELP_STRING([--enable-isulad], [enable adapt to iSulad [default=no]])], ++ [adapt_isulad=$enableval], [adapt_isulad=no]) + AM_CONDITIONAL([HAVE_ISULAD], [test "x$adapt_isulad" = "xyes"]) + if test "x$adapt_isulad" = "xyes"; then + AC_DEFINE([HAVE_ISULAD], 1, [adapt to iSulad]) +-- +2.25.1 + diff --git a/lxc.spec b/lxc.spec index e06e2b8..ab21363 100644 --- a/lxc.spec +++ b/lxc.spec @@ -1,4 +1,4 @@ -%global _release 2022072104 +%global _release 2022072201 Name: lxc Version: 4.0.3 @@ -16,6 +16,7 @@ Patch0005: 0005-refactor-patch-code-of-attach-and-seccomp.patch Patch0006: 0006-refactor-patch-about-namespace-log-terminal.patch Patch0007: 0007-refactor-patches-on-terminal.c-start.c-and-so-on.patch Patch0008: 0008-refactor-patch-code-of-json.patch +Patch0009: 0009-default-set-have_isulad-false.patch BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath BuildRequires: pkgconfig(libseccomp) @@ -77,7 +78,8 @@ This package contains documentation for lxc for creating containers. --disable-silent-rules --docdir=%{_pkgdocdir} --disable-rpath \ --disable-static --disable-apparmor --enable-selinux \ --enable-seccomp \ - --with-init-script=systemd --disable-werror + --with-init-script=systemd --disable-werror \ + --enable-isulad=yes %{make_build} @@ -187,6 +189,12 @@ make check %{_mandir}/*/man7/%{name}* %changelog +* Fri Jul 22 2022 zhangxiaoyu - 4.0.3-2022072201 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: default set have_isulad false + * Thu Jul 21 2022 zhangxiaoyu - 4.0.3-2022072104 - Type:bugfix - ID:NA -- Gitee