From 00cc8afd1e80e73f1205691c4ce440498b52eba5 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Sun, 1 Dec 2019 00:20:34 -0800 Subject: cri-o: workaround failure since go upgraded to 1.13 Since go was upgraded to 1.13, there is a failure: ... | src/vendor/golang.org/x/net/http2/frame.go:17:2: use of vendored package not allowed | ../../../recipe-sysroot/usr/lib64/go/src/net/http/h2_bundle.go:49:2: use of vendored package not allowed ... Refer upstream suggestion [1]: `or copying your vendor contents into GOPATH/src rather than mapping them in to GOPATH/src/vendor.' [1] https://github.com/golang/go/issues/34068 Signed-off-by: Hongxu Jia Signed-off-by: Bruce Ashfield --- recipes-containers/cri-o/cri-o_git.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-containers/cri-o/cri-o_git.bb b/recipes-containers/cri-o/cri-o_git.bb index 8d754ecd..4fee3856 100644 --- a/recipes-containers/cri-o/cri-o_git.bb +++ b/recipes-containers/cri-o/cri-o_git.bb @@ -109,6 +109,9 @@ do_compile() { # fixes the bin/crio build of oe_runmake binaries below ln -sf ../../../../cmd/crio ${S}/src/import/src/github.com/cri-o/cri-o/cmd/ + # workaround `use of vendored package not allowed' failure + mv ${S}/src/import/vendor/golang.org ${S}/src/import/ + cd ${S}/src/import if [ "${CRIO_BUILD_CROSS}" = "1" ]; then -- cgit v1.2.3-54-g00ecf