diff options
Diffstat (limited to 'recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch')
| -rw-r--r-- | recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch b/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch index a58feed1..20647c01 100644 --- a/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch +++ b/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch @@ -7,16 +7,27 @@ We want to use the go compiler as defined in the oe-enviroment, not the generic call to 'go'. Without changing this, we'll get things like cgo errors and invalid flag combos. +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -Index: git/src/import/Makefile +Index: git/Makefile =================================================================== ---- git.orig/src/import/Makefile 2020-10-12 07:36:18.775820388 -0700 -+++ git/src/import/Makefile 2020-10-12 08:00:05.134151221 -0700 -@@ -163,19 +163,19 @@ +--- git.orig/Makefile ++++ git/Makefile +@@ -121,7 +121,7 @@ + TESTFLAGS_PARALLEL ?= 8 + + # Use this to replace `go test` with, for instance, `gotestsum` +-GOTEST ?= go test ++GOTEST ?= $(GO) test + + OUTPUTDIR = $(join $(ROOTDIR), _output) + CRIDIR=$(OUTPUTDIR)/cri +@@ -169,7 +169,7 @@ build: ## build the go packages @echo "$(WHALE) $@" @@ -25,31 +36,16 @@ Index: git/src/import/Makefile test: ## run tests, except integration tests and tests that require root @echo "$(WHALE) $@" -- @go test ${TESTFLAGS} $(filter-out ${INTEGRATION_PACKAGE},${PACKAGES}) -+ @$(GO) test ${TESTFLAGS} $(filter-out ${INTEGRATION_PACKAGE},${PACKAGES}) - - root-test: ## run tests, except integration tests - @echo "$(WHALE) $@" -- @go test ${TESTFLAGS} $(filter-out ${INTEGRATION_PACKAGE},${TEST_REQUIRES_ROOT_PACKAGES}) -test.root -+ @$(GO) test ${TESTFLAGS} $(filter-out ${INTEGRATION_PACKAGE},${TEST_REQUIRES_ROOT_PACKAGES}) -test.root - - integration: ## run integration tests - @echo "$(WHALE) $@" -- @go test ${TESTFLAGS} -test.root -parallel ${TESTFLAGS_PARALLEL} -+ @$(GO) test ${TESTFLAGS} -test.root -parallel ${TESTFLAGS_PARALLEL} - - benchmark: ## run benchmarks tests - @echo "$(WHALE) $@" -@@ -185,7 +185,7 @@ +@@ -201,7 +201,7 @@ - define BUILD_BINARY = + define BUILD_BINARY @echo "$(WHALE) $@" -@go build ${DEBUG_GO_GCFLAGS} ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@ ${GO_LDFLAGS} ${GO_TAGS} ./$< +@$(GO) build ${DEBUG_GO_GCFLAGS} ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@ ${GO_LDFLAGS} ${GO_TAGS} ./$< endef # Build a binary from a cmd. -@@ -194,15 +194,15 @@ +@@ -210,15 +210,15 @@ bin/containerd-shim: cmd/containerd-shim FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220 @echo "$(WHALE) bin/containerd-shim" |