Forráskód Böngészése

Merge pull request #19681 from karalabe/fix-libusb-docker

vendor: pull in USB fix for docker (alpine/musl)
Péter Szilágyi 6 éve
szülő
commit
ce43c2366d

+ 6 - 0
vendor/github.com/karalabe/usb/Dockerfile.alpine

@@ -0,0 +1,6 @@
+FROM golang:alpine
+
+RUN apk add --no-cache git gcc musl-dev linux-headers
+
+ADD . $GOPATH/src/github.com/karalabe/usb
+RUN cd $GOPATH/src/github.com/karalabe/usb && go install

+ 4 - 0
vendor/github.com/karalabe/usb/Dockerfile.ubuntu

@@ -0,0 +1,4 @@
+FROM golang:latest
+
+ADD . $GOPATH/src/github.com/karalabe/usb
+RUN cd $GOPATH/src/github.com/karalabe/usb && go install

+ 1 - 1
vendor/github.com/karalabe/usb/libs.go

@@ -23,7 +23,7 @@ package usb
 #cgo CFLAGS: -DDEFAULT_VISIBILITY=""
 #cgo CFLAGS: -DPOLL_NFDS_TYPE=int
 
-#cgo linux CFLAGS: -DOS_LINUX -D_GNU_SOURCE
+#cgo linux CFLAGS: -DOS_LINUX -D_GNU_SOURCE -DHAVE_SYS_TIME_H
 #cgo linux,!android LDFLAGS: -lrt
 #cgo darwin CFLAGS: -DOS_DARWIN -DHAVE_SYS_TIME_H
 #cgo darwin LDFLAGS: -framework CoreFoundation -framework IOKit -lobjc

+ 3 - 3
vendor/vendor.json

@@ -267,10 +267,10 @@
 			"revisionTime": "2017-04-30T22:20:11Z"
 		},
 		{
-			"checksumSHA1": "0ixnoiChdbeva2xNe3z/vYzqcL4=",
+			"checksumSHA1": "wqKuSmlxa4hVZwfs4ZjtKtM5Yp0=",
 			"path": "github.com/karalabe/usb",
-			"revision": "0efdeddd92369dc00d4fb1b9cd56a442bdb61f82",
-			"revisionTime": "2019-06-06T09:23:27Z",
+			"revision": "3eff4807c21acef1c5f1b712a225ab09a8961504",
+			"revisionTime": "2019-06-07T09:24:32Z",
 			"tree": true
 		},
 		{