mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-04 12:01:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

testing/cni-plugins: fix build on x86

Browse Source 
Fail build on x86:
github.com/safchain/ethtool/ethtool.go:205:35: undefined: syscall.SYS_SOCKET

Applied patch as described here:
https://github.com/safchain/ethtool/pull/16
This commit is contained in:
Francesco Colista 2019-05-13 10:19:03 +00:00
parent 7c3c6c9d9c
commit fe569ef05e
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testing/cni-plugins/APKBUILD
View File

@ -9,7 +9,8 @@ arch="all"
license="Apache"
makedepends="go bash linux-headers"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/containernetworking/plugins/archive/v${pkgver}.tar.gz"
source="$pkgname-$pkgver.tar.gz::https://github.com/containernetworking/plugins/archive/v${pkgver}.tar.gz
ethtool-x86-go.patch"
builddir="$srcdir/plugins-$pkgver"
build() {
@ -29,4 +30,5 @@ package() {
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
sha512sums="de685a66e0e875e8a2209b76c5d1f5fd0e426804e3db6084cf2e89695a8b1876eae47ff1fcfdf065a3b027918fe7c4775d2321358402dbd1206928538edb52b4 cni-plugins-0.8.0.tar.gz"
sha512sums="de685a66e0e875e8a2209b76c5d1f5fd0e426804e3db6084cf2e89695a8b1876eae47ff1fcfdf065a3b027918fe7c4775d2321358402dbd1206928538edb52b4 cni-plugins-0.8.0.tar.gz
f247f36d1c0ef6d5022f217dd6a6cc09c92211fe060077d8dc7df4a391b7db13a73cd4edb039c9539f735d6d9c4cde93ee8592d566efa4a3ed216bdbabfd96a1 ethtool-x86-go.patch"

17
testing/cni-plugins/ethtool-x86-go.patch Normal file
View File

@ -0,0 +1,17 @@
diff --git a/vendor/github.com/safchain/ethtool/ethtool.go b/vendor/github.com/safchain/ethtool/ethtool.go
index 1f8828f..98387e6 100644
--- a/vendor/github.com/safchain/ethtool/ethtool.go
+++ b/vendor/github.com/safchain/ethtool/ethtool.go
@@ -202,9 +202,9 @@ func (e *Ethtool) Close() {
}
func NewEthtool() (*Ethtool, error) {
- fd, _, err := syscall.RawSyscall(syscall.SYS_SOCKET, syscall.AF_INET, syscall.SOCK_DGRAM, syscall.IPPROTO_IP)
- if err != 0 {
- return nil, syscall.Errno(err)
+ fd, err := syscall.Socket(syscall.AF_INET, syscall.SOCK_DGRAM, syscall.IPPROTO_IP)
+ if err != nil {
+ return nil, err
}
return &Ethtool{