summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-containers/cri-o/cri-o_git.bb7
-rw-r--r--recipes-containers/cri-o/files/0001-Makefile-force-symlinks.patch28
2 files changed, 3 insertions, 32 deletions
diff --git a/recipes-containers/cri-o/cri-o_git.bb b/recipes-containers/cri-o/cri-o_git.bb
index d5672213..1d27eb7a 100644
--- a/recipes-containers/cri-o/cri-o_git.bb
+++ b/recipes-containers/cri-o/cri-o_git.bb
@@ -14,10 +14,9 @@ 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
17SRCREV_cri-o = "ab7845e07e67ba714818af91cdbc67b12da87bcc" 17SRCREV_cri-o = "6c5e39a4f971ee9f9db82e570280b6162dd42fcb"
18SRC_URI = "\ 18SRC_URI = "\
19 git://github.com/kubernetes-sigs/cri-o.git;branch=release-1.27;name=cri-o;protocol=https \ 19 git://github.com/kubernetes-sigs/cri-o.git;branch=release-1.28;name=cri-o;protocol=https \
20 file://0001-Makefile-force-symlinks.patch \
21 file://crio.conf \ 20 file://crio.conf \
22 " 21 "
23 22
@@ -27,7 +26,7 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c2
27 26
28GO_IMPORT = "import" 27GO_IMPORT = "import"
29 28
30PV = "1.27.1+git${SRCREV_cri-o}" 29PV = "1.28.0+git${SRCREV_cri-o}"
31 30
32inherit features_check 31inherit features_check
33REQUIRED_DISTRO_FEATURES ?= "seccomp" 32REQUIRED_DISTRO_FEATURES ?= "seccomp"
diff --git a/recipes-containers/cri-o/files/0001-Makefile-force-symlinks.patch b/recipes-containers/cri-o/files/0001-Makefile-force-symlinks.patch
deleted file mode 100644
index 50a36eec..00000000
--- a/recipes-containers/cri-o/files/0001-Makefile-force-symlinks.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 52fd70ae7d82dfa0db46ff7ba67cfb4868074368 Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@gmail.com>
3Date: Tue, 7 Jun 2022 15:42:22 -0400
4Subject: [PATCH] Makefile: force symlinks
5
6Upstream-Status: Inappropriate [embedded specific]
7
8Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
9---
10 Makefile | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/src/import/Makefile b/src/import/Makefile
14index 8abc8619d..d1a98f3d3 100644
15--- a/src/import/Makefile
16+++ b/src/import/Makefile
17@@ -141,7 +141,7 @@ help:
18 .gopathok:
19 ifeq ("$(wildcard $(GOPKGDIR))","")
20 mkdir -p "$(GOPKGBASEDIR)"
21- ln -s "$(CURDIR)" "$(GOPKGDIR)"
22+ ln -sf "$(CURDIR)" "$(GOPKGDIR)"
23 endif
24 if [ ! -d "$(GOPATH)" ]; then mkdir -p $(GOPATH); fi
25 touch "$(GOPATH)/.gopathok"
26--
272.19.1
28