From 9f1d9d324d1cee0dcfa6d21d13018a423a4640e2 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Tue, 13 Aug 2024 10:17:40 -0700 Subject: [PATCH] gokrazy/tsapp: remove builddirs packages that aren't in config.json These three packages aren't in gokrazy/tsapp/config.json but used to be. Unfortunately, that meant that were being included in the resulting image. Apparently `gok` doesn't delete them or warn about them being present on disk when they're moved from the config file. Updates #13038 Updates #1866 Change-Id: I54918a9e3286ea755b11dde5e9efdd433b8f8fb8 Signed-off-by: Brad Fitzpatrick --- .../gokrazy/gokrazy/cmd/heartbeat/go.mod | 5 ----- .../gokrazy/gokrazy/cmd/heartbeat/go.sum | 14 -------------- .../github.com/gokrazy/gokrazy/cmd/randomd/go.mod | 5 ----- .../github.com/gokrazy/gokrazy/cmd/randomd/go.sum | 4 ---- .../tsapp/builddir/github.com/gokrazy/mkfs/go.mod | 5 ----- .../tsapp/builddir/github.com/gokrazy/mkfs/go.sum | 4 ---- 6 files changed, 37 deletions(-) delete mode 100644 gokrazy/tsapp/builddir/github.com/gokrazy/gokrazy/cmd/heartbeat/go.mod delete mode 100644 gokrazy/tsapp/builddir/github.com/gokrazy/gokrazy/cmd/heartbeat/go.sum delete mode 100644 gokrazy/tsapp/builddir/github.com/gokrazy/gokrazy/cmd/randomd/go.mod delete mode 100644 gokrazy/tsapp/builddir/github.com/gokrazy/gokrazy/cmd/randomd/go.sum delete mode 100644 gokrazy/tsapp/builddir/github.com/gokrazy/mkfs/go.mod delete mode 100644 gokrazy/tsapp/builddir/github.com/gokrazy/mkfs/go.sum diff --git a/gokrazy/tsapp/builddir/github.com/gokrazy/gokrazy/cmd/heartbeat/go.mod b/gokrazy/tsapp/builddir/github.com/gokrazy/gokrazy/cmd/heartbeat/go.mod deleted file mode 100644 index d851081bb..000000000 --- a/gokrazy/tsapp/builddir/github.com/gokrazy/gokrazy/cmd/heartbeat/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module gokrazy/build/tsapp - -go 1.22.2 - -require github.com/gokrazy/gokrazy v0.0.0-20240525065858-dedadaf38803 // indirect diff --git a/gokrazy/tsapp/builddir/github.com/gokrazy/gokrazy/cmd/heartbeat/go.sum b/gokrazy/tsapp/builddir/github.com/gokrazy/gokrazy/cmd/heartbeat/go.sum deleted file mode 100644 index 4c510f049..000000000 --- a/gokrazy/tsapp/builddir/github.com/gokrazy/gokrazy/cmd/heartbeat/go.sum +++ /dev/null @@ -1,14 +0,0 @@ -github.com/gokrazy/gokrazy v0.0.0-20240525065858-dedadaf38803 h1:gdGRW/wXHPJuZgZD931Lh75mdJfzEEXrL+Dvi97Ck3A= -github.com/gokrazy/gokrazy v0.0.0-20240525065858-dedadaf38803/go.mod h1:NHROeDlzn0icUl3f+tEYvGGpcyBDMsr3AvKLHOWRe5M= -github.com/gokrazy/internal v0.0.0-20240510165500-68dd68393b7a h1:FKeN678rNpKTpWRdFbAhYL9mWzPu57R5XPXCR3WmXdI= -github.com/gokrazy/internal v0.0.0-20240510165500-68dd68393b7a/go.mod h1:t3ZirVhcs9bH+fPAJuGh51rzT7sVCZ9yfXvszf0ZjF0= -github.com/google/renameio/v2 v2.0.0 h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg= -github.com/google/renameio/v2 v2.0.0/go.mod h1:BtmJXm5YlszgC+TD4HOEEUFgkJP3nLxehU6hfe7jRt4= -github.com/kenshaw/evdev v0.1.0 h1:wmtceEOFfilChgdNT+c/djPJ2JineVsQ0N14kGzFRUo= -github.com/kenshaw/evdev v0.1.0/go.mod h1:B/fErKCihUyEobz0mjn2qQbHgyJKFQAxkXSvkeeA/Wo= -github.com/mdlayher/watchdog v0.0.0-20201005150459-8bdc4f41966b h1:7tUBfsEEBWfFeHOB7CUfoOamak+Gx/BlirfXyPk1WjI= -github.com/mdlayher/watchdog v0.0.0-20201005150459-8bdc4f41966b/go.mod h1:bmoJUS6qOA3uKFvF3KVuhf7mU1KQirzQMeHXtPyKEqg= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= diff --git a/gokrazy/tsapp/builddir/github.com/gokrazy/gokrazy/cmd/randomd/go.mod b/gokrazy/tsapp/builddir/github.com/gokrazy/gokrazy/cmd/randomd/go.mod deleted file mode 100644 index d851081bb..000000000 --- a/gokrazy/tsapp/builddir/github.com/gokrazy/gokrazy/cmd/randomd/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module gokrazy/build/tsapp - -go 1.22.2 - -require github.com/gokrazy/gokrazy v0.0.0-20240525065858-dedadaf38803 // indirect diff --git a/gokrazy/tsapp/builddir/github.com/gokrazy/gokrazy/cmd/randomd/go.sum b/gokrazy/tsapp/builddir/github.com/gokrazy/gokrazy/cmd/randomd/go.sum deleted file mode 100644 index 0e63641e9..000000000 --- a/gokrazy/tsapp/builddir/github.com/gokrazy/gokrazy/cmd/randomd/go.sum +++ /dev/null @@ -1,4 +0,0 @@ -github.com/gokrazy/gokrazy v0.0.0-20240525065858-dedadaf38803 h1:gdGRW/wXHPJuZgZD931Lh75mdJfzEEXrL+Dvi97Ck3A= -github.com/gokrazy/gokrazy v0.0.0-20240525065858-dedadaf38803/go.mod h1:NHROeDlzn0icUl3f+tEYvGGpcyBDMsr3AvKLHOWRe5M= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= diff --git a/gokrazy/tsapp/builddir/github.com/gokrazy/mkfs/go.mod b/gokrazy/tsapp/builddir/github.com/gokrazy/mkfs/go.mod deleted file mode 100644 index 8aa5a2955..000000000 --- a/gokrazy/tsapp/builddir/github.com/gokrazy/mkfs/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module gokrazy/build/tsapp - -go 1.22.2 - -require github.com/gokrazy/mkfs v0.0.0-20230114091253-b6755f9e9632 // indirect diff --git a/gokrazy/tsapp/builddir/github.com/gokrazy/mkfs/go.sum b/gokrazy/tsapp/builddir/github.com/gokrazy/mkfs/go.sum deleted file mode 100644 index 551d1b5d7..000000000 --- a/gokrazy/tsapp/builddir/github.com/gokrazy/mkfs/go.sum +++ /dev/null @@ -1,4 +0,0 @@ -github.com/gokrazy/internal v0.0.0-20210621162516-1b3b5687a06d h1:qk95CKJfxvU5oi3lbrVkEgID5ak1pOjTyPTdaXs6Q9E= -github.com/gokrazy/internal v0.0.0-20210621162516-1b3b5687a06d/go.mod h1:Gqv1x1DNrObmBvVvblpZbvZizZ0dU5PwiwYHipmtY9Y= -github.com/gokrazy/mkfs v0.0.0-20230114091253-b6755f9e9632 h1:Vt3rJdB4p56yjK4CKhb/awHT6Qj7LoC3CwPoOaiNS6k= -github.com/gokrazy/mkfs v0.0.0-20230114091253-b6755f9e9632/go.mod h1:O2w1ipGvg78u3F61FnLp36Db3MsUbdy8E/ciG64jbGY=