mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-16 17:36:59 +02:00
app-emulation/docker: remove unnecessary patch for etcd
Now that Docker 20.10.13 updated its vendored etcd to 3.3.27, it is not necessary any more to fix F_OFD_GETLK in etcd. Simply remove it.
This commit is contained in:
parent
d344be8799
commit
96d59a1d55
@ -70,9 +70,7 @@ RESTRICT="installsources strip test"
|
|||||||
|
|
||||||
S="${WORKDIR}/${P}/src/${EGO_PN}"
|
S="${WORKDIR}/${P}/src/${EGO_PN}"
|
||||||
|
|
||||||
# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
|
|
||||||
PATCHES=(
|
PATCHES=(
|
||||||
"${FILESDIR}/etcd-F_OFD_GETLK-fix.patch"
|
|
||||||
"${FILESDIR}/ppc64-buildmode.patch"
|
"${FILESDIR}/ppc64-buildmode.patch"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -1,28 +0,0 @@
|
|||||||
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
|
|
||||||
)
|
|
Loading…
Reference in New Issue
Block a user