diff options
| -rw-r--r-- | recipes-containers/cri-o/cri-o_git.bb | 7 | ||||
| -rw-r--r-- | recipes-containers/cri-o/files/0001-Makefile-force-symlinks.patch | 28 |
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 | ||
| 17 | SRCREV_cri-o = "ab7845e07e67ba714818af91cdbc67b12da87bcc" | 17 | SRCREV_cri-o = "6c5e39a4f971ee9f9db82e570280b6162dd42fcb" |
| 18 | SRC_URI = "\ | 18 | SRC_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 | ||
| 28 | GO_IMPORT = "import" | 27 | GO_IMPORT = "import" |
| 29 | 28 | ||
| 30 | PV = "1.27.1+git${SRCREV_cri-o}" | 29 | PV = "1.28.0+git${SRCREV_cri-o}" |
| 31 | 30 | ||
| 32 | inherit features_check | 31 | inherit features_check |
| 33 | REQUIRED_DISTRO_FEATURES ?= "seccomp" | 32 | REQUIRED_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 @@ | |||
| 1 | From 52fd70ae7d82dfa0db46ff7ba67cfb4868074368 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
| 3 | Date: Tue, 7 Jun 2022 15:42:22 -0400 | ||
| 4 | Subject: [PATCH] Makefile: force symlinks | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [embedded specific] | ||
| 7 | |||
| 8 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
| 9 | --- | ||
| 10 | Makefile | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/src/import/Makefile b/src/import/Makefile | ||
| 14 | index 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 | -- | ||
| 27 | 2.19.1 | ||
| 28 | |||
