diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
| commit | 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch) | |
| tree | b9791a06ab3284e27b568412c59316c66240c682 /app-containers/docker/files | |
| parent | 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff) | |
gentoo resync : 22.12.2021
Diffstat (limited to 'app-containers/docker/files')
| -rw-r--r-- | app-containers/docker/files/etcd-F_OFD_GETLK-fix.patch | 28 | ||||
| -rw-r--r-- | app-containers/docker/files/ppc64-buildmode.patch | 30 |
2 files changed, 58 insertions, 0 deletions
diff --git a/app-containers/docker/files/etcd-F_OFD_GETLK-fix.patch b/app-containers/docker/files/etcd-F_OFD_GETLK-fix.patch new file mode 100644 index 000000000000..bd574e26f040 --- /dev/null +++ b/app-containers/docker/files/etcd-F_OFD_GETLK-fix.patch @@ -0,0 +1,28 @@ +From ec81adb21605acd56b122bc35c53644b13d3ab7e Mon Sep 17 00:00:00 2001 +From: Moritz Both <mb@aldebaran.de> +Date: Sun, 1 Nov 2020 23:20:12 +0100 +Subject: [PATCH] pkg/fileutil: fix constant for linux locking + +The constant F_OFD_GETLK is 36, not 37, according to +/usr/include/bits/fcntl-linux.h +Credits go to joakim-tjernlund who digged deep enough +to find this. + +Fixes #31182 +--- + pkg/fileutil/lock_linux.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pkg/fileutil/lock_linux.go b/pkg/fileutil/lock_linux.go +index 939fea62381..004d35fa23b 100644 +--- a/vendor/github.com/coreos/etcd/pkg/fileutil/lock_linux.go ++++ b/vendor/github.com/coreos/etcd/pkg/fileutil/lock_linux.go +@@ -29,7 +29,7 @@ import ( + // + // constants from /usr/include/bits/fcntl-linux.h + const ( +- F_OFD_GETLK = 37 ++ F_OFD_GETLK = 36 + F_OFD_SETLK = 37 + F_OFD_SETLKW = 38 + ) diff --git a/app-containers/docker/files/ppc64-buildmode.patch b/app-containers/docker/files/ppc64-buildmode.patch new file mode 100644 index 000000000000..f16756e85041 --- /dev/null +++ b/app-containers/docker/files/ppc64-buildmode.patch @@ -0,0 +1,30 @@ +From c4135e37e54a6480abfe18746f227f05cb9269ab Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Thu, 10 Jun 2021 16:19:22 -0700 +Subject: [PATCH] don't use buildmode=pie on ppc64 + +It's already omitted for ppc64 in +hack/dockerfile/install/install.sh +not using wildcard, because GOARCH=ppc64le supports pie + +Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org> +--- + hack/make/.binary | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hack/make/.binary b/hack/make/.binary +index 5ea3e373f2..7a911de15a 100644 +--- a/hack/make/.binary ++++ b/hack/make/.binary +@@ -70,7 +70,7 @@ hash_files() { + + # -buildmode=pie is not supported on Windows and Linux on mips and riscv64. + case "$(go env GOOS)/$(go env GOARCH)" in +- windows/* | linux/mips* | linux/riscv*) ;; ++ windows/* | linux/mips* | linux/riscv* | linux/ppc64) ;; + + *) + BUILDFLAGS+=("-buildmode=pie") +-- +2.32.0 + |