diff --git a/lxcfs-tools-sw.patch b/0006-lxcfs-tools-sw.patch similarity index 100% rename from lxcfs-tools-sw.patch rename to 0006-lxcfs-tools-sw.patch diff --git a/lxcfs-tools.spec b/lxcfs-tools.spec index c14e515fbd394c1ea8d33d0d95b19d1b5b634a85..b5f369273d17c13603fa5adfa0a3bd06bafefd98 100644 --- a/lxcfs-tools.spec +++ b/lxcfs-tools.spec @@ -1,7 +1,7 @@ #Basic Information Name: lxcfs-tools Version: 0.3 -Release: 30 +Release: 31 Summary: toolkit for lxcfs to remount a running isulad License: Mulan PSL v2 URL: https://gitee.com/openeuler/lxcfs-tools @@ -13,7 +13,7 @@ Patch2: 0002-enable-external-linkmode-for-cgo-build.patch Patch3: 0003-retry-10-times-to-avoid-isulad-unavailable.patch Patch4: 0004-add-dt-test.patch Patch5: 0005-add-riscv64-to-syscall-build.patch -Patch6: lxcfs-tools-sw.patch +Patch6: 0006-lxcfs-tools-sw.patch #Dependency BuildRequires: golang > 1.7 @@ -26,9 +26,6 @@ A toolkit for lxcfs to remount a running isulad when crashes recover #Build sections %prep %autosetup -n %{name}-v%{version} -p1 -%ifnarch sw_64 -%patch6 -R -p1 -%endif %build make @@ -52,7 +49,7 @@ make tests %preun %post -GRAPH=`isula info | grep -Eo "iSulad Root Dir:.+" | grep -Eo "\/.*"` +GRAPH=`isula info | grep -Eo "iSulad Root Dir:.+" | grep -Eo "/.*"` if [ "$GRAPH" == "" ]; then GRAPH="/var/lib/isulad" fi @@ -101,6 +98,12 @@ rm -rfv %{buildroot} %changelog +* Tue Aug 29 2023 yangjiaqi - 0.3-31 +- Type:bugfix +- CVE:NA +- SUG:restart +- DESC:remove redundant symbol and adjust patches order + * Mon Jul 03 2023 wujie - 0.3-30 - add riscv64 to syscall_linux_64.go build