2 files changed, 8 insertions, 51 deletions

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 0b106e41..4328647d 100644
--- a/recipes-containers/cri-o/files/0001-Makefile-force-symlinks.patch
+++ b/recipes-containers/cri-o/files/0001-Makefile-force-symlinks.patch
@@ -1,26 +1,26 @@
-From 53371afbf0f20a1651ee6f2406cd2be056a31066 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@windriver.com>
-Date: Thu, 1 Nov 2018 11:17:05 -0400
+From 52fd70ae7d82dfa0db46ff7ba67cfb4868074368 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Tue, 7 Jun 2022 15:42:22 -0400
 Subject: [PATCH] Makefile: force symlinks
 
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
 ---
  Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/import/Makefile b/src/import/Makefile
-index cf37bec..68c8eeb 100644
+index 8abc8619d..d1a98f3d3 100644
 --- a/src/import/Makefile
 +++ b/src/import/Makefile
-@@ -66,7 +66,7 @@ help:
+@@ -141,7 +141,7 @@ help:
  .gopathok:
  ifeq ("$(wildcard $(GOPKGDIR))","")
         mkdir -p "$(GOPKGBASEDIR)"
 -       ln -s "$(CURDIR)" "$(GOPKGDIR)"
 +       ln -sf "$(CURDIR)" "$(GOPKGDIR)"
  endif
+        if [ ! -d "$(GOPATH)" ]; then mkdir -p $(GOPATH); fi
         touch "$(GOPATH)/.gopathok"
- 
 -- 
-2.7.4
+2.19.1
 
diff --git a/recipes-containers/cri-o/files/Makefile-skip-install-when-generating-the-config.h.patch b/recipes-containers/cri-o/files/Makefile-skip-install-when-generating-the-config.h.patch
deleted file mode 100644
index 24c7e9d7..00000000
--- a/recipes-containers/cri-o/files/Makefile-skip-install-when-generating-the-config.h.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 3822e834d2dbd87a4dc8cdd36e7fe3b0e9020c4f Mon Sep 17 00:00:00 2001
-From: Mark Asselstine <mark.asselstine@windriver.com>
-Date: Tue, 9 Apr 2019 13:52:59 -0400
-Subject: [PATCH] Makefile: skip install when generating the config.h
-
-When running 'go build' "The -i flag installs the packages that are
-dependencies of the target." The Makefile makes use of this since many
-of the dependencies needed to complete this rule will be used to by
-other rules in the Makefile, thus speeding the overall build time
-(avoiding redoing work).
-
-In our case the crio-config tool and its dependencies are not being
-cross-compiled as they have to run locally to produce the
-conmon/config.h file and thus installing them is not useful. In this
-case there are no savings and can actually result in errors during the
-build or if the build ARCH and target ARCH are the same, a potential
-for host contamination.
-
-So we drop the use of '-i'.
-
-Upstream-Status: Inappropriate [cross compile issue]
-
-Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/import/Makefile b/src/import/Makefile
-index b9fa97f..8336a5b 100644
---- a/src/import/Makefile
-+++ b/src/import/Makefile
-@@ -109,7 +109,7 @@ release-note:
-        @$(GOPATH)/bin/release-tool -n $(release)
- 
- conmon/config.h: cmd/crio-config/config.go oci/oci.go
--       $(GO) build -i $(LDFLAGS) -o bin/crio-config $(PROJECT)/cmd/crio-config
-+       $(GO) build $(LDFLAGS) -o bin/crio-config $(PROJECT)/cmd/crio-config
-        ( cd conmon && $(CURDIR)/bin/crio-config )
- 
- clean:
--- 
-2.7.4
-