diff options
-rw-r--r-- | recipes-containers/cri-o/cri-o_git.bb | 4 | ||||
-rw-r--r-- | recipes-containers/cri-o/files/0001-Add-trimpath-to-build-nri.test.patch | 15 |
2 files changed, 8 insertions, 11 deletions
diff --git a/recipes-containers/cri-o/cri-o_git.bb b/recipes-containers/cri-o/cri-o_git.bb index f04c4feb..9dd37da8 100644 --- a/recipes-containers/cri-o/cri-o_git.bb +++ b/recipes-containers/cri-o/cri-o_git.bb | |||
@@ -14,7 +14,7 @@ At a high level, we expect the scope of cri-o to be restricted to the following | |||
14 | - Resource isolation as required by the CRI \ | 14 | - Resource isolation as required by the CRI \ |
15 | " | 15 | " |
16 | 16 | ||
17 | SRCREV_cri-o = "20c06a19cb395445620c31730c0f1a0a1922eaae" | 17 | SRCREV_cri-o = "33d75981bee230f791709975125d7386fe2c530a" |
18 | SRC_URI = "\ | 18 | SRC_URI = "\ |
19 | git://github.com/kubernetes-sigs/cri-o.git;branch=release-1.31;name=cri-o;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ | 19 | git://github.com/kubernetes-sigs/cri-o.git;branch=release-1.31;name=cri-o;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ |
20 | file://0001-Add-trimpath-to-build-nri.test.patch \ | 20 | file://0001-Add-trimpath-to-build-nri.test.patch \ |
@@ -28,7 +28,7 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c2 | |||
28 | 28 | ||
29 | GO_IMPORT = "import" | 29 | GO_IMPORT = "import" |
30 | 30 | ||
31 | PV = "1.31.0+git${SRCREV_cri-o}" | 31 | PV = "1.31.4+git${SRCREV_cri-o}" |
32 | 32 | ||
33 | inherit features_check ptest | 33 | inherit features_check ptest |
34 | REQUIRED_DISTRO_FEATURES ?= "seccomp" | 34 | REQUIRED_DISTRO_FEATURES ?= "seccomp" |
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 index c6be41f0..c26e58fd 100644 --- 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 | |||
@@ -13,19 +13,16 @@ Signed-off-by: Peng Zhang <peng.zhang1.cn@windriver.com> | |||
13 | Makefile | 2 +- | 13 | Makefile | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | Index: cri-o-1.31.0+git20c06a19cb395445620c31730c0f1a0a1922eaae/src/import/Makefile | 16 | Index: cri-o-1.31.4+git33d75981bee230f791709975125d7386fe2c530a/src/import/Makefile |
17 | =================================================================== | 17 | =================================================================== |
18 | --- cri-o-1.31.0+git20c06a19cb395445620c31730c0f1a0a1922eaae.orig/src/import/Makefile | 18 | --- cri-o-1.31.4+git33d75981bee230f791709975125d7386fe2c530a.orig/src/import/Makefile |
19 | +++ cri-o-1.31.0+git20c06a19cb395445620c31730c0f1a0a1922eaae/src/import/Makefile | 19 | +++ cri-o-1.31.4+git33d75981bee230f791709975125d7386fe2c530a/src/import/Makefile |
20 | @@ -169,7 +169,7 @@ test/checkcriu/checkcriu: $(GO_FILES) | 20 | @@ -213,7 +213,7 @@ |
21 | $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ ./test/checkcriu | 21 | $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ ./test/checkcriu |
22 | 22 | ||
23 | test/nri/nri.test: $(wildcard test/nri/*.go) | 23 | test/nri/nri.test: $(wildcard test/nri/*.go) ## Build the NRI test binary. |
24 | - $(GO) test --tags "test $(BUILDTAGS)" -c ./test/nri -o $@ | 24 | - $(GO) test --tags "test $(BUILDTAGS)" -c ./test/nri -o $@ |
25 | + $(GO) test --tags "test $(BUILDTAGS)" -c ./test/nri -o $@ ${TRIMPATH} | 25 | + $(GO) test --tags "test $(BUILDTAGS)" -c ./test/nri -o $@ ${TRIMPATH} |
26 | 26 | ||
27 | bin/crio: $(GO_FILES) | 27 | bin/crio: $(GO_FILES) ## Build the CRI-O main binary. |
28 | $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ ./cmd/crio | 28 | $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ ./cmd/crio |
29 | -- | ||
30 | 2.34.1 | ||
31 | |||