From e53055f5a1e2753fdb08508a97411ca137a19c61 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 1 Nov 2018 11:58:50 -0400 Subject: cri-o: update to 1.12 release Since kubernetes is now on 1.12, we need to sync our cri-o release to match. There are some build changes to the utilities, and a patch refresh, but otherwise, this is very similar to the exiting build of cri-o. Signed-off-by: Bruce Ashfield --- .../cri-o/files/0001-Makefile-force-symlinks.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'recipes-containers/cri-o/files/0001-Makefile-force-symlinks.patch') diff --git a/recipes-containers/cri-o/files/0001-Makefile-force-symlinks.patch b/recipes-containers/cri-o/files/0001-Makefile-force-symlinks.patch index 320eac86..0b106e41 100644 --- a/recipes-containers/cri-o/files/0001-Makefile-force-symlinks.patch +++ b/recipes-containers/cri-o/files/0001-Makefile-force-symlinks.patch @@ -1,6 +1,6 @@ -From a4433978bf324525b4c260b0e9615ae27271fe55 Mon Sep 17 00:00:00 2001 +From 53371afbf0f20a1651ee6f2406cd2be056a31066 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield -Date: Wed, 20 Sep 2017 12:05:40 -0400 +Date: Thu, 1 Nov 2018 11:17:05 -0400 Subject: [PATCH] Makefile: force symlinks Signed-off-by: Bruce Ashfield @@ -9,18 +9,18 @@ Signed-off-by: Bruce Ashfield 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/import/Makefile b/src/import/Makefile -index e3e5050bb7f6..4ad3fb7ff0a9 100644 +index cf37bec..68c8eeb 100644 --- a/src/import/Makefile +++ b/src/import/Makefile -@@ -53,7 +53,7 @@ help: +@@ -66,7 +66,7 @@ help: .gopathok: ifeq ("$(wildcard $(GOPKGDIR))","") mkdir -p "$(GOPKGBASEDIR)" -- ln -s "$(CURDIR)" "$(GOPKGBASEDIR)" -+ ln -sf "$(CURDIR)" "$(GOPKGBASEDIR)" +- ln -s "$(CURDIR)" "$(GOPKGDIR)" ++ ln -sf "$(CURDIR)" "$(GOPKGDIR)" endif touch "$(GOPATH)/.gopathok" -- -2.4.0.53.g8440f74 +2.7.4 -- cgit v1.2.3-54-g00ecf