diff --git a/0001-fix-failed-build-with-golang-1.15.5.patch b/0001-fix-failed-build-with-golang-1.15.5.patch new file mode 100644 index 0000000..21f1480 --- /dev/null +++ b/0001-fix-failed-build-with-golang-1.15.5.patch @@ -0,0 +1,42 @@ +From a6d6645e49ebdabab0359a920dcaf2393cc9e460 Mon Sep 17 00:00:00 2001 +From: wangkang +Date: Wed, 23 Dec 2020 10:40:15 +0800 +Subject: [PATCH] fix failed build with golang 1.15.5 + +Signed-off-by: wangkang +--- + patch/0001-fix-docker-pkg-mount.patch | 4 ++-- + vendor/modules.txt | 2 -- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/patch/0001-fix-docker-pkg-mount.patch b/patch/0001-fix-docker-pkg-mount.patch +index cdd2a5e..4a2f0a6 100644 +--- a/patch/0001-fix-docker-pkg-mount.patch ++++ b/patch/0001-fix-docker-pkg-mount.patch +@@ -1,8 +1,8 @@ + diff --git a/vendor/github.com/docker/docker/pkg/mount/flags.go b/vendor/github.com/docker/docker/pkg/mount/flags.go +-index d2fb1fb..0f6fd61 100644 ++index 607dbed..11c92f6 100644 + --- a/vendor/github.com/docker/docker/pkg/mount/flags.go + +++ b/vendor/github.com/docker/docker/pkg/mount/flags.go +-@@ -90,3 +90,7 @@ func ParseTmpfsOptions(options string) (int, string, error) { ++@@ -147,3 +147,7 @@ func ParseTmpfsOptions(options string) (int, string, error) { + } + return flags, data, nil + } +diff --git a/vendor/modules.txt b/vendor/modules.txt +index 47a3869..2a68362 100644 +--- a/vendor/modules.txt ++++ b/vendor/modules.txt +@@ -1,8 +1,6 @@ + # github.com/Microsoft/go-winio v0.4.14 + github.com/Microsoft/go-winio + github.com/Microsoft/go-winio/pkg/guid +-# github.com/Sirupsen/logrus v0.0.0-00010101000000-000000000000 => github.com/sirupsen/logrus v1.4.2 +-github.com/Sirupsen/logrus + # github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b + github.com/coreos/go-systemd/dbus + github.com/coreos/go-systemd/util +-- +2.18.4 + diff --git a/syscontainer-tools.spec b/syscontainer-tools.spec index f5307bb..ee12a7e 100644 --- a/syscontainer-tools.spec +++ b/syscontainer-tools.spec @@ -4,13 +4,15 @@ #Basic Information Name: syscontainer-tools Version: 0.9 -Release: 2 +Release: 3 Summary: syscontainer tools for IT, work with iSulad License: Mulan PSL v2 URL: https://gitee.com/openeuler/syscontainer-tools Source0: https://gitee.com/openeuler/syscontainer-tools/repository/archive/v%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-root +Patch0001: 0001-fix-failed-build-with-golang-1.15.5.patch + #Dependency BuildRequires: glibc-static BuildRequires: golang > 1.6 @@ -22,7 +24,7 @@ This is syscontainer tools, to make it work, you need a isulad and util-linux #Build sections %prep -%setup -n %{name} -q +%autosetup -n %{name} -Sgit -p1 %build make init && make @@ -108,6 +110,9 @@ chmod 0640 ${HOOK_SPEC}/hookspec.json rm -rfv %{buildroot} %changelog +* Wed Dec 23 2020 wangkang101<873229877@qq.com> - 0.9-3 +- fix failed build with golang 1.15.5 + * Mon Sep 07 2020 wangkang101<873229877@qq.com> - 0.9-2 - modify url of source0