packages/moby
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!3 allow builtable with golang-1.17.x

Browse Source 
From: @wanglmb 
Reviewed-by: @duguhaotian 
Signed-off-by: @duguhaotian
This commit is contained in:
openeuler-ci-bot 2022-12-21 03:04:37 +00:00 committed by Gitee
commit b3715d1cd4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0001-revert-any-to-interface-temporarily-allow-builtable.patch Normal file
View File

@ -0,0 +1,26 @@
From 402a2c8ed1e509a917cf7a22609e49aea2bc0921 Mon Sep 17 00:00:00 2001
From: wanglimin <wanglimin@xfusion.com>
Date: Wed, 21 Dec 2022 09:49:14 +0800
Subject: [PATCH] revert any to interface{} temporarily to allow builtable with
golang-1.17.x it will be withdrawed if golang upgrade to 1.18.x in the branch
---
vendor/archive/tar/common.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vendor/archive/tar/common.go b/vendor/archive/tar/common.go
index c99b5c1..595de64 100644
--- a/vendor/archive/tar/common.go
+++ b/vendor/archive/tar/common.go
@@ -538,7 +538,7 @@ type headerFileInfo struct {
func (fi headerFileInfo) Size() int64 { return fi.h.Size }
func (fi headerFileInfo) IsDir() bool { return fi.Mode().IsDir() }
func (fi headerFileInfo) ModTime() time.Time { return fi.h.ModTime }
-func (fi headerFileInfo) Sys() any { return fi.h }
+func (fi headerFileInfo) Sys() interface{} { return fi.h }
// Name returns the base name of the file.
func (fi headerFileInfo) Name() string {
--
2.21.0

10
moby.spec
View File

@ -7,7 +7,7 @@
Name: docker
Version: 20.10.21
Release: 1
Release: 2
Summary: The open-source application container engine
License: ASL 2.0
URL: https://www.docker.com
@ -22,6 +22,8 @@ Source3: libnetwork-dcdf8f17.tar.gz
Source4: docker.service
Source5: docker.socket
Patch0001: 0001-revert-any-to-interface-temporarily-allow-builtable.patch
Requires: %{name}-engine = %{version}-%{release}
Requires: %{name}-client = %{version}-%{release}
@ -194,5 +196,9 @@ fi
%systemd_postun_with_restart docker.service
%changelog
* Thu 14 2022 wanglimin<wanglimin@xfusion.com> - 20.10.21-1
* Wed Dec 21 2022 wanglimin<wanglimin@xfusion.com> - 20.10.21-2
- DESC: revert any to interface{} temporarily to allow builtable with golang-1.17.x
- it will be withdrawed if golang upgrade to 1.18.x in the branch
* Thu Dec 14 2022 wanglimin<wanglimin@xfusion.com> - 20.10.21-1
- DESC: initial docker-20.10.21-1