From: Chen Qi <[email protected]> 0001-Add-trimpath-to-build-nri.test.patch is rebased against this new version.
Signed-off-by: Chen Qi <[email protected]> --- recipes-containers/cri-o/cri-o_git.bb | 6 +++--- .../0001-Add-trimpath-to-build-nri.test.patch | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/recipes-containers/cri-o/cri-o_git.bb b/recipes-containers/cri-o/cri-o_git.bb index f04c4feb..5c2c453e 100644 --- a/recipes-containers/cri-o/cri-o_git.bb +++ b/recipes-containers/cri-o/cri-o_git.bb @@ -14,10 +14,10 @@ At a high level, we expect the scope of cri-o to be restricted to the following - Resource isolation as required by the CRI \ " -SRCREV_cri-o = "20c06a19cb395445620c31730c0f1a0a1922eaae" +SRCREV_cri-o = "33d75981bee230f791709975125d7386fe2c530a" SRC_URI = "\ git://github.com/kubernetes-sigs/cri-o.git;branch=release-1.31;name=cri-o;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ - file://0001-Add-trimpath-to-build-nri.test.patch \ + file://0001-Add-trimpath-to-build-nri.test.patch;patchdir=src/import \ file://crio.conf \ file://run-ptest \ " @@ -28,7 +28,7 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c2 GO_IMPORT = "import" -PV = "1.31.0+git${SRCREV_cri-o}" +PV = "1.31.4+git${SRCREV_cri-o}" inherit features_check ptest 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..bf73250a 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 @@ -1,4 +1,4 @@ -From 0bf230f59d211044e7993543e010b0d7f9dcead3 Mon Sep 17 00:00:00 2001 +From a1eafac8256fbff81b72c82213eb5a37858d2e6a Mon Sep 17 00:00:00 2001 From: Peng Zhang <[email protected]> Date: Fri, 25 Oct 2024 10:42:02 +0800 Subject: [PATCH] Add --trimpath to build nri.test @@ -13,19 +13,19 @@ Signed-off-by: Peng Zhang <[email protected]> Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: cri-o-1.31.0+git20c06a19cb395445620c31730c0f1a0a1922eaae/src/import/Makefile -=================================================================== ---- cri-o-1.31.0+git20c06a19cb395445620c31730c0f1a0a1922eaae.orig/src/import/Makefile -+++ cri-o-1.31.0+git20c06a19cb395445620c31730c0f1a0a1922eaae/src/import/Makefile -@@ -169,7 +169,7 @@ test/checkcriu/checkcriu: $(GO_FILES) +diff --git a/Makefile b/Makefile +index 34f9d429d..f5a033023 100644 +--- a/Makefile ++++ b/Makefile +@@ -213,7 +213,7 @@ test/checkcriu/checkcriu: $(GO_FILES) ## Build the checkcriu test binary. $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ ./test/checkcriu - test/nri/nri.test: $(wildcard test/nri/*.go) + 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) + bin/crio: $(GO_FILES) ## Build the CRI-O main binary. $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ ./cmd/crio -- -2.34.1 +2.25.1 -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#9082): https://lists.yoctoproject.org/g/meta-virtualization/message/9082 Mute This Topic: https://lists.yoctoproject.org/mt/110623151/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
