summaryrefslogtreecommitdiffstats
path: root/recipes-containers/cri-o/files/0001-Add-trimpath-to-build-nri.test.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-containers/cri-o/files/0001-Add-trimpath-to-build-nri.test.patch')
-rw-r--r--recipes-containers/cri-o/files/0001-Add-trimpath-to-build-nri.test.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/recipes-containers/cri-o/files/0001-Add-trimpath-to-build-nri.test.patch b/recipes-containers/cri-o/files/0001-Add-trimpath-to-build-nri.test.patch
new file mode 100644
index 00000000..c6be41f0
--- /dev/null
+++ b/recipes-containers/cri-o/files/0001-Add-trimpath-to-build-nri.test.patch
@@ -0,0 +1,31 @@
1From 0bf230f59d211044e7993543e010b0d7f9dcead3 Mon Sep 17 00:00:00 2001
2From: Peng Zhang <peng.zhang1.cn@windriver.com>
3Date: Fri, 25 Oct 2024 10:42:02 +0800
4Subject: [PATCH] Add --trimpath to build nri.test
5
6when build test-binary, TMPDIR[buildpaths] error found in nri.test
7to fix this error, add "--trimpath" option to build nri.test.
8
9Upstream-Status: Inappropriate [oe specific]
10
11Signed-off-by: Peng Zhang <peng.zhang1.cn@windriver.com>
12---
13 Makefile | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16Index: cri-o-1.31.0+git20c06a19cb395445620c31730c0f1a0a1922eaae/src/import/Makefile
17===================================================================
18--- cri-o-1.31.0+git20c06a19cb395445620c31730c0f1a0a1922eaae.orig/src/import/Makefile
19+++ cri-o-1.31.0+git20c06a19cb395445620c31730c0f1a0a1922eaae/src/import/Makefile
20@@ -169,7 +169,7 @@ test/checkcriu/checkcriu: $(GO_FILES)
21 $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ ./test/checkcriu
22
23 test/nri/nri.test: $(wildcard test/nri/*.go)
24- $(GO) test --tags "test $(BUILDTAGS)" -c ./test/nri -o $@
25+ $(GO) test --tags "test $(BUILDTAGS)" -c ./test/nri -o $@ ${TRIMPATH}
26
27 bin/crio: $(GO_FILES)
28 $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ ./cmd/crio
29--
302.34.1
31