From 9805288cdd852f6de70b27451a2df320d071af28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Fri, 7 Jun 2019 12:30:50 +0300 Subject: [PATCH] vendor: pull in USB fix for docker (alpine/musl) --- vendor/github.com/karalabe/usb/Dockerfile.alpine | 6 ++++++ vendor/github.com/karalabe/usb/Dockerfile.ubuntu | 4 ++++ vendor/github.com/karalabe/usb/libs.go | 2 +- vendor/vendor.json | 6 +++--- 4 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 vendor/github.com/karalabe/usb/Dockerfile.alpine create mode 100644 vendor/github.com/karalabe/usb/Dockerfile.ubuntu diff --git a/vendor/github.com/karalabe/usb/Dockerfile.alpine b/vendor/github.com/karalabe/usb/Dockerfile.alpine new file mode 100644 index 000000000..342bdf79a --- /dev/null +++ b/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 diff --git a/vendor/github.com/karalabe/usb/Dockerfile.ubuntu b/vendor/github.com/karalabe/usb/Dockerfile.ubuntu new file mode 100644 index 000000000..b861e497b --- /dev/null +++ b/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 diff --git a/vendor/github.com/karalabe/usb/libs.go b/vendor/github.com/karalabe/usb/libs.go index 94720fbd4..6446acee9 100644 --- a/vendor/github.com/karalabe/usb/libs.go +++ b/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 diff --git a/vendor/vendor.json b/vendor/vendor.json index 946508a33..94f4742e6 100644 --- a/vendor/vendor.json +++ b/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 }, {