From b6171d2f03d66548ee8399a4a8d83a98d9f697dd Mon Sep 17 00:00:00 2001 From: vegbir Date: Wed, 9 Aug 2023 07:39:39 +0000 Subject: [PATCH] isolate sw patch by code to avoid rolling back patch Signed-off-by: vegbir --- ...0006-syscontainer-tools-Add-sw64-architecture.patch | 0 syscontainer-tools.spec | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) rename 0005-syscontainer-tools-Add-sw64-architecture.patch => 0006-syscontainer-tools-Add-sw64-architecture.patch (100%) diff --git a/0005-syscontainer-tools-Add-sw64-architecture.patch b/0006-syscontainer-tools-Add-sw64-architecture.patch similarity index 100% rename from 0005-syscontainer-tools-Add-sw64-architecture.patch rename to 0006-syscontainer-tools-Add-sw64-architecture.patch diff --git a/syscontainer-tools.spec b/syscontainer-tools.spec index 24c706f..1808b0f 100644 --- a/syscontainer-tools.spec +++ b/syscontainer-tools.spec @@ -1,7 +1,7 @@ #Basic Information Name: syscontainer-tools Version: 0.9 -Release: 53 +Release: 54 Summary: syscontainer tools for IT, work with iSulad License: Mulan PSL v2 URL: https://gitee.com/openeuler/syscontainer-tools @@ -13,7 +13,7 @@ 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: 0005-syscontainer-tools-Add-sw64-architecture.patch +Patch6: 0006-syscontainer-tools-Add-sw64-architecture.patch #Dependency BuildRequires: glibc-static @@ -27,9 +27,6 @@ This is syscontainer tools, to make it work, you need a isulad and util-linux #Build sections %prep %autosetup -n %{name}-v%{version} -p1 -%ifnarch sw_64 -%patch6 -R -p1 -%endif %build make init && make @@ -118,6 +115,9 @@ chmod 0640 ${HOOK_SPEC}/hookspec.json rm -rfv %{buildroot} %changelog +* Wed Aug 09 2023 yangjiaqi - 0.9-54 +- isolate sw patch by code to avoid rolling back patch + * Fri Jun 30 2023 wujie - 0.9-53 - add riscv64 to syscall_linux_64.go build