packages/lxcfs-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove redundant symbol and adjust patches order

Browse Source 
Signed-off-by: vegbir <yangjiaqi16@huawei.com>
This commit is contained in:
vegbir 2023-08-29 02:46:21 +00:00
parent 30334690a7
commit d778701eee
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
lxcfs-tools-sw.patch → 0006-lxcfs-tools-sw.patch
View File

15
lxcfs-tools.spec
View File

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