cri-o: build crio-config natively to generate conmon/config.h

Part of building cri-o is the generation of the 'conmon/config.h'
file. The content of this file is dynamic in that it has buffer sizes
and a socket path which will depend on constants that are set in other
parts of the code. For example the socket path can be setup for
Windows or for Linux.

To generate 'conmon/config.h' a small GO application is built and run
called crio-config. This isn't really suitable for a -native package
but we do have to run crio-config on the build host so we don't want
to cross compile it. We therefor use the native GO to build this. This
change allows things to work when the build host arch and the target
arch don't match. A small update to the Makefile avoids mixing build
host arch and target arch GO packages.

Finally, We drop the crio-config binary from the install as it is only
used to create the conmon/config.h as part of the build. This is
consistent with the Makefile's install rule which does not install
this binary as it has no use on the target.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/recipes-containers/cri-o/cri-o_git.bb b/recipes-containers/cri-o/cri-o_git.bb
index cac55368..bc211f12 100644
--- a/recipes-containers/cri-o/cri-o_git.bb
+++ b/recipes-containers/cri-o/cri-o_git.bb
@@ -18,6 +18,7 @@ SRCREV_cri-o = "b986e6a8d2af34451363492479d2671a68fd20a3"
 SRC_URI = "\
         git://github.com/kubernetes-sigs/cri-o.git;branch=release-1.13;name=cri-o \
         file://0001-Makefile-force-symlinks.patch \
+        file://Makefile-skip-install-when-generating-the-config.h.patch \
         file://crio.conf \
         "
 
@@ -74,6 +75,12 @@ do_compile() {
 
         cd ${S}/src/import
 
+        # Build conmon/config.h, requires native versions of
+        # cmd/crio-config/config.go and oci/oci.go
+        (CGO_ENABLED=0 GO=go GOARCH=${BUILD_GOARCH} GOOS=${BUILD_GOOS} oe_runmake conmon/config.h)
+        rm -f bin/crio-config
+        rm -rf vendor/pkg
+
         oe_runmake binaries
 }
 
@@ -96,7 +103,6 @@ do_install() {
     install -m 755 -D ${S}/src/import/test/testdata/* ${D}/${sysconfdir}/crio/config/
 
     install ${S}/src/import/bin/crio ${D}/${localbindir}
-    install ${S}/src/import/bin/crio-config ${D}/${localbindir}
 
     install ${S}/src/import/bin/conmon ${D}/${localbindir}/crio
     install ${S}/src/import/bin/pause ${D}/${localbindir}/crio