docker:components:add config files for riscv

Signe:-off-by: yangyanchao <yangyanchao6@huawei.com>
This commit is contained in:
yangyanchao 2021-01-04 10:42:48 +08:00
parent a6a851b83b
commit 4780a2ff0e
5 changed files with 15905 additions and 9 deletions

View File

@ -1,6 +1,6 @@
Name: docker-engine
Version: 18.09.0
Release: 110
Release: 111
Summary: The open-source application container engine
Group: Tools/Docker
@ -210,7 +210,21 @@ fi
%endif
%changelog
* Fri Dec 27 2020 liuzekun<liuzekun@huawei.com> - 18.09.109
* Mon Jan 4 2021 yangyanchao<yangyanchao6@huawei.com> - 18.09.111
- Type:requirement
- ID:NA
- CVE:NA
- SUG:restart
- docker:components:add config files for riscv
* Mon Dec 21 2020 fengshaobao<shaobao.feng@huawei.com> - 18.09.110
- Type:bugfix
- ID:NA
- CVE:NA
- SUG:restart
- DESC: append the image hostname itself as an endpoint even the registry mirror matched.
* Fri Nov 27 2020 liuzekun<liuzekun@huawei.com> - 18.09.109
- Type:bugfix
- ID:NA
- CVE:NA
@ -223,10 +237,3 @@ fi
5.do not sync if BYPAAS_SYNC is false
6.fix panic on single-character volumes
7.mask /proc/pin_memory
* Mon Dec 21 2020 fengshaobao<shaobao.feng@huawei.com> - 18.09.110
- Type:bugfix
- ID:NA
- CVE:NA
- SUG:restart
- DESC: append the image hostname itself as an endpoint even the registry mirror matched.

View File

@ -0,0 +1,77 @@
From c97b550df673a7ceb1f801b7099476feba622130 Mon Sep 17 00:00:00 2001
From: yangyanchao <yangyanchao6@huawei.com>
Date: Sat, 19 Dec 2020 09:19:31 +0000
Subject: [PATCH 1/3] docker:components:engine:vendor:add riscv64 config in
existing files
Signed-off-by: yangyanchao <yangyanchao6@huawei.com>
---
.../drivers/bridge/netlink_deprecated_linux_armppc64.go | 2 +-
.../drivers/bridge/netlink_deprecated_linux_notarm.go | 2 +-
.../golang.org/x/net/internal/socket/cmsghdr_linux_64bit.go | 2 +-
.../vendor/golang.org/x/net/internal/socket/iovec_64bit.go | 2 +-
.../golang.org/x/net/internal/socket/msghdr_linux_64bit.go | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_armppc64.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_armppc64.go
index 739d9c6..a937f50 100644
--- a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_armppc64.go
+++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_armppc64.go
@@ -1,4 +1,4 @@
-// +build arm ppc64 ppc64le
+// +build arm ppc64 ppc64le riscv64
package bridge
diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go
index df52695..68d368c 100644
--- a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go
+++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go
@@ -1,4 +1,4 @@
-// +build !arm,!ppc64,!ppc64le
+// +build !arm,!ppc64,!ppc64le,!riscv64
package bridge
diff --git a/components/engine/vendor/golang.org/x/net/internal/socket/cmsghdr_linux_64bit.go b/components/engine/vendor/golang.org/x/net/internal/socket/cmsghdr_linux_64bit.go
index 63f0534..852a71b 100644
--- a/components/engine/vendor/golang.org/x/net/internal/socket/cmsghdr_linux_64bit.go
+++ b/components/engine/vendor/golang.org/x/net/internal/socket/cmsghdr_linux_64bit.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// +build arm64 amd64 ppc64 ppc64le mips64 mips64le s390x
+// +build arm64 amd64 ppc64 ppc64le mips64 mips64le s390x riscv64
// +build linux
package socket
diff --git a/components/engine/vendor/golang.org/x/net/internal/socket/iovec_64bit.go b/components/engine/vendor/golang.org/x/net/internal/socket/iovec_64bit.go
index afb34ad..a2b17e2 100644
--- a/components/engine/vendor/golang.org/x/net/internal/socket/iovec_64bit.go
+++ b/components/engine/vendor/golang.org/x/net/internal/socket/iovec_64bit.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// +build arm64 amd64 ppc64 ppc64le mips64 mips64le s390x
+// +build arm64 amd64 ppc64 ppc64le mips64 mips64le s390x riscv64
// +build darwin dragonfly freebsd linux netbsd openbsd
package socket
diff --git a/components/engine/vendor/golang.org/x/net/internal/socket/msghdr_linux_64bit.go b/components/engine/vendor/golang.org/x/net/internal/socket/msghdr_linux_64bit.go
index 610fc4f..375d402 100644
--- a/components/engine/vendor/golang.org/x/net/internal/socket/msghdr_linux_64bit.go
+++ b/components/engine/vendor/golang.org/x/net/internal/socket/msghdr_linux_64bit.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// +build arm64 amd64 ppc64 ppc64le mips64 mips64le s390x
+// +build arm64 amd64 ppc64 ppc64le mips64 mips64le s390x riscv64
// +build linux
package socket
--
2.23.0

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -169,4 +169,7 @@ patch/0171-docker-do-not-sync-if-BYPAAS_SYNC-is-false.patch
patch/0172-docker-fix-panic-on-single-character-volumes.patch
patch/0173-docker-mask-proc-pin_memory.patch
patch/0174-docker-do-not-return-when-matched-registry-mirror.patch
patch/0175-docker-components-engine-vendor-add-riscv64-config.patch
patch/0176-docker-components-engine-vendor-add-new-config-file-for-riscv.patch
patch/0177-docker-components-cli-vendor-add-new-config-file-for-riscv.patch
#end