diff --git a/gokrazy/Makefile b/gokrazy/Makefile index 85f8c25..b43fe44 100644 --- a/gokrazy/Makefile +++ b/gokrazy/Makefile @@ -16,5 +16,5 @@ _update: -hostname=$(DEVICE) \ github.com/gokrazy/breakglass \ github.com/gokrazy/serial-busybox \ - github.com/mdlayher/consrv \ + github.com/mdlayher/consrv/cmd/consrv \ github.com/prometheus/node_exporter diff --git a/gokrazy/go.mod b/gokrazy/go.mod index 4ef98b7..e4302d5 100644 --- a/gokrazy/go.mod +++ b/gokrazy/go.mod @@ -9,7 +9,7 @@ require ( github.com/gokrazy/kernel v0.0.0-20220206085004-b9f59d355d8a github.com/gokrazy/rpi-eeprom v0.0.0-20220126033524-e673395298ef github.com/gokrazy/serial-busybox v0.0.0-20211029180129-24c7ca0a91ab - github.com/mdlayher/consrv v0.0.0-20220131144135-fe847c9f508d + github.com/mdlayher/consrv v0.0.0-20220215204021-5249700425a4 github.com/prometheus/node_exporter v1.3.1 ) @@ -64,12 +64,12 @@ require ( github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 // indirect go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect - golang.org/x/crypto v0.0.0-20220208050332-20e1d8d225ab // indirect + golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect golang.org/x/mod v0.5.1 // indirect golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20220207234003-57398862261d // indirect + golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/tools v0.1.9 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect @@ -81,6 +81,3 @@ require ( honnef.co/go/tools v0.2.2 // indirect rsc.io/goversion v1.2.0 // indirect ) - -// Temporary fork: remove perf collector due to broken APIs. -replace github.com/prometheus/node_exporter => /home/matt/src/github.com/prometheus/node_exporter diff --git a/gokrazy/go.sum b/gokrazy/go.sum index 3827ebe..71d3a19 100644 --- a/gokrazy/go.sum +++ b/gokrazy/go.sum @@ -246,8 +246,8 @@ github.com/mattn/go-xmlrpc v0.0.3 h1:Y6WEMLEsqs3RviBrAa1/7qmbGB7DVD3brZIbqMbQdGY github.com/mattn/go-xmlrpc v0.0.3/go.mod h1:mqc2dz7tP5x5BKlCahN/n+hs7OSZKJkS9JsHNBRlrxA= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mdlayher/consrv v0.0.0-20220131144135-fe847c9f508d h1:gFQ/uY+Jbwtds+x53n4ujjx5mZoO8Ec+25KALzvOy7I= -github.com/mdlayher/consrv v0.0.0-20220131144135-fe847c9f508d/go.mod h1:jeiz2LmiXMH+sU5VxAGnFUS/IMt5Vq8OX9d2n6Oiga8= +github.com/mdlayher/consrv v0.0.0-20220215204021-5249700425a4 h1:bpuxU+TgC/jyuOWLlfVY0W1f2EeAY8K7zUkE0GZ5F9U= +github.com/mdlayher/consrv v0.0.0-20220215204021-5249700425a4/go.mod h1:EvxMPrYvyrbqYc7pYFUi7lVXSzqDbDXxVwHkfxaU0iE= github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43/go.mod h1:+t7E0lkKfbBsebllff1xdTmyJt8lH37niI6kwFk9OTo= github.com/mdlayher/ethtool v0.0.0-20211028163843-288d040e9d60/go.mod h1:aYbhishWc4Ai3I2U4Gaa2n3kHWSwzme6EsG/46HRQbE= github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc= @@ -382,9 +382,8 @@ golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWP golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220128200615-198e4374d7ed/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220208050332-20e1d8d225ab h1:lnZ4LoV0UMdibeCUfIB2a4uFwRu491WX/VB2reB8xNc= -golang.org/x/crypto v0.0.0-20220208050332-20e1d8d225ab/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE= +golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -556,8 +555,8 @@ golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220207234003-57398862261d h1:Bm7BNOQt2Qv7ZqysjeLjgCBanX+88Z/OtdvsrEv1Djc= -golang.org/x/sys v0.0.0-20220207234003-57398862261d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= diff --git a/gokrazy/gokrazy.go b/gokrazy/gokrazy.go index c9a9c63..3930796 100644 --- a/gokrazy/gokrazy.go +++ b/gokrazy/gokrazy.go @@ -9,6 +9,6 @@ import ( _ "github.com/gokrazy/rpi-eeprom" _ "github.com/gokrazy/serial-busybox" - _ "github.com/mdlayher/consrv" + _ "github.com/mdlayher/consrv/cmd/consrv" _ "github.com/prometheus/node_exporter" )