From 9fcf6ea43505918d28e12511c782b74eaba663a0 Mon Sep 17 00:00:00 2001 From: Patrick Gerber Date: Sun, 4 Dec 2022 15:06:43 +0100 Subject: [PATCH] package/mender-artifact: remove unnecessary GO_ENV Commit 235636409fdd (package/mender-artifact: do not download modules during the build process) introduced the use of GOFLAGS="-mod=vendor", in 2020-08-13, before we had the go download post-process... ... which was introduced with ommit 24ac316ff58e (package/pkg-golang.mk: implement Go vendoring support), in 2022-01-08, which added $(2)_DL_ENV which contains $(HOST_GO_COMMON_ENV). HOST_GO_COMMON_ENV, set in go/go.mk@23,i already contains GOFLAGS="-mod=vendor". Signed-off-by: Patrick Gerber [yann.morin.1998@free.fr: extend commit log] Signed-off-by: Yann E. MORIN --- package/mender-artifact/mender-artifact.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/package/mender-artifact/mender-artifact.mk b/package/mender-artifact/mender-artifact.mk index 1031166f34..6ade624a23 100644 --- a/package/mender-artifact/mender-artifact.mk +++ b/package/mender-artifact/mender-artifact.mk @@ -86,14 +86,6 @@ HOST_MENDER_ARTIFACT_LICENSE_FILES = \ HOST_MENDER_ARTIFACT_DEPENDENCIES = host-xz -# By default, go will attempt to download needed modules before building, which -# is not desirable. This behavior also causes permission issues when cleaning, -# as go downloads modules as read-only by default. Because mender-artifact -# includes the modules in the vendor directory, mod=vendor prevents the package -# from downloading the go modules during the build process and prevents -# permission issues when cleaning. -HOST_MENDER_ARTIFACT_GO_ENV = GOFLAGS="-mod=vendor" - HOST_MENDER_ARTIFACT_LDFLAGS = -X github.com/mendersoftware/mender-artifact/cli.Version=$(HOST_MENDER_ARTIFACT_VERSION) HOST_MENDER_ARTIFACT_BIN_NAME = mender-artifact