git: ef7fee403f7f - main - Mk/Uses/go.mk: Revert part of 4e2913317
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 07 May 2022 18:48:11 UTC
The branch main has been updated by dmgk: URL: https://cgit.FreeBSD.org/ports/commit/?id=ef7fee403f7f9ac3a73be03891bb61413c18ca1c commit ef7fee403f7f9ac3a73be03891bb61413c18ca1c Author: Dmitri Goutnik <dmgk@FreeBSD.org> AuthorDate: 2022-05-07 17:38:30 +0000 Commit: Dmitri Goutnik <dmgk@FreeBSD.org> CommitDate: 2022-05-07 18:43:24 +0000 Mk/Uses/go.mk: Revert part of 4e2913317 Revert module cache revalidation in post-fetch (`go mod verify`), it breaks non-root poudriere builds. `go mod verify` needs read/write access to the GOMODCACHE and because extract stage runs fetch stage again but under a restricted user, `go mod verify` fails with a "permission denied" error. --- Mk/Uses/go.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk index bdee332a368b..0b5f48ed8e07 100644 --- a/Mk/Uses/go.mk +++ b/Mk/Uses/go.mk @@ -166,8 +166,7 @@ post-fetch: @${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies"; @(cd ${DISTDIR}/${DIST_SUBDIR}; \ [ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \ - ${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x; \ - ${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod verify) + ${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x) . endif . if !target(post-extract)