From 0bf230f59d211044e7993543e010b0d7f9dcead3 Mon Sep 17 00:00:00 2001 From: Peng Zhang Date: Fri, 25 Oct 2024 10:42:02 +0800 Subject: [PATCH] Add --trimpath to build nri.test when build test-binary, TMPDIR[buildpaths] error found in nri.test to fix this error, add "--trimpath" option to build nri.test. Upstream-Status: Inappropriate [oe specific] Signed-off-by: Peng Zhang --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: cri-o-1.31.4+git33d75981bee230f791709975125d7386fe2c530a/src/import/Makefile =================================================================== --- cri-o-1.31.4+git33d75981bee230f791709975125d7386fe2c530a.orig/src/import/Makefile +++ cri-o-1.31.4+git33d75981bee230f791709975125d7386fe2c530a/src/import/Makefile @@ -213,7 +213,7 @@ $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ ./test/checkcriu test/nri/nri.test: $(wildcard test/nri/*.go) ## Build the NRI test binary. - $(GO) test --tags "test $(BUILDTAGS)" -c ./test/nri -o $@ + $(GO) test --tags "test $(BUILDTAGS)" -c ./test/nri -o $@ ${TRIMPATH} bin/crio: $(GO_FILES) ## Build the CRI-O main binary. $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ ./cmd/crio