!71 hide error when isula info is abnormal
From: @vegbir Reviewed-by: @zhangsong234, @jingwoo Signed-off-by: @zhangsong234, @jingwoo
This commit is contained in:
commit
ca55005f18
135526
1001-add-loongarch64-support-not-upstream-modified-files.patch
Normal file
135526
1001-add-loongarch64-support-not-upstream-modified-files.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
||||
#Basic Information
|
||||
Name: syscontainer-tools
|
||||
Version: 0.9
|
||||
Release: 61
|
||||
Release: 63
|
||||
Summary: syscontainer tools for IT, work with iSulad
|
||||
License: Mulan PSL v2
|
||||
URL: https://gitee.com/openeuler/syscontainer-tools
|
||||
@ -13,14 +13,18 @@ Patch2: 0002-syscontainer-tools-build-security-option.patch
|
||||
Patch3: 0003-enable-external-linkmode-for-cgo-build.patch
|
||||
Patch4: 0004-add-dt-test.patch
|
||||
Patch5: 0005-add-riscv64-to-syscall-build.patch
|
||||
Patch6: 0006-support-ipv6.patch
|
||||
Patch7: 0007-use-file-locks-to-avoid-remounting-the-sharepath-mas.patch
|
||||
Patch8: 0008-clean-up-run-syscontainer-tools-netns-containerid-di.patch
|
||||
Patch9: 0009-drop-useless-function-error-and-info.patch
|
||||
Patch10: 0010-fix-log-of-removeUdevRule.patch
|
||||
|
||||
%ifarch sw_64
|
||||
Patch6: 0006-syscontainer-tools-Add-sw64-architecture.patch
|
||||
Patch1000: 1000-add-sw_64-support-not-upstream-modified-files.patch
|
||||
%endif
|
||||
%ifarch loongarch64
|
||||
Patch1001: 1001-add-loongarch64-support-not-upstream-modified-files.patch
|
||||
%endif
|
||||
Patch7: 0007-support-ipv6.patch
|
||||
Patch8: 0008-use-file-locks-to-avoid-remounting-the-sharepath-mas.patch
|
||||
Patch9: 0009-clean-up-run-syscontainer-tools-netns-containerid-di.patch
|
||||
Patch10: 0010-drop-useless-function-error-and-info.patch
|
||||
Patch11: 0011-fix-log-of-removeUdevRule.patch
|
||||
|
||||
#Dependency
|
||||
BuildRequires: glibc-static
|
||||
@ -60,8 +64,8 @@ make localtest
|
||||
%preun
|
||||
|
||||
%post
|
||||
GRAPH=`isula info | grep -Eo "iSulad Root Dir:.+" | grep -Eo "/.*"`
|
||||
if [ "$GRAPH" == "" ]; then
|
||||
GRAPH=`isula info 2>/dev/null | grep -Eo "iSulad Root Dir:.+" | grep -Eo "/.*"`
|
||||
if [ x"$GRAPH" == "x" ]; then
|
||||
GRAPH="/var/lib/isulad"
|
||||
fi
|
||||
|
||||
@ -122,6 +126,18 @@ chmod 0640 ${HOOK_SPEC}/hookspec.json
|
||||
rm -rfv %{buildroot}
|
||||
|
||||
%changelog
|
||||
* Mon Dec 25 2023 yangjiaqi <yangjiaqi16@huawei.com> - 0.9-63
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC:add loongarch64 support
|
||||
|
||||
* Mon Dec 25 2023 yangjiaqi <yangjiaqi16@huawei.com> - 0.9-62
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC:hide error when isula info is abnormal
|
||||
|
||||
* Thu Sep 21 2023 yangjiaqi<yangjiaqi16@huawei.com> - 0.9-61
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user