8 Star 3 Fork 22

src-openEuler / syscontainer-tools

加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
0001-fix-failed-build-with-golang-1.15.5.patch 1.62 KB
一键复制 编辑 原始数据 按行查看 历史
wangkang101 提交于 2020-12-23 15:40 . fix failed build with golang 1.15.5
From a6d6645e49ebdabab0359a920dcaf2393cc9e460 Mon Sep 17 00:00:00 2001
From: wangkang <wangkang101@huawei.com>
Date: Wed, 23 Dec 2020 10:40:15 +0800
Subject: [PATCH] fix failed build with golang 1.15.5
Signed-off-by: wangkang <wangkang101@huawei.com>
---
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
1
https://gitee.com/src-openeuler/syscontainer-tools.git
git@gitee.com:src-openeuler/syscontainer-tools.git
src-openeuler
syscontainer-tools
syscontainer-tools
master

搜索帮助