summaryrefslogtreecommitdiffstats
path: root/recipes-containers/cri-o/cri-o_git.bb
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-12-01 00:20:34 -0800
committerBruce Ashfield <bruce.ashfield@gmail.com>2019-12-01 23:07:03 -0500
commit00cc8afd1e80e73f1205691c4ce440498b52eba5 (patch)
tree9d61f64f6337bdabf5801deaa464c88b7c35c756 /recipes-containers/cri-o/cri-o_git.bb
parent7d13954a893fb5eaf2d5d91be18847e209f17673 (diff)
downloadmeta-virtualization-00cc8afd1e80e73f1205691c4ce440498b52eba5.tar.gz
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 <hongxu.jia@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/cri-o/cri-o_git.bb')
-rw-r--r--recipes-containers/cri-o/cri-o_git.bb3
1 files changed, 3 insertions, 0 deletions
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() {
109 # fixes the bin/crio build of oe_runmake binaries below 109 # fixes the bin/crio build of oe_runmake binaries below
110 ln -sf ../../../../cmd/crio ${S}/src/import/src/github.com/cri-o/cri-o/cmd/ 110 ln -sf ../../../../cmd/crio ${S}/src/import/src/github.com/cri-o/cri-o/cmd/
111 111
112 # workaround `use of vendored package not allowed' failure
113 mv ${S}/src/import/vendor/golang.org ${S}/src/import/
114
112 cd ${S}/src/import 115 cd ${S}/src/import
113 116
114 if [ "${CRIO_BUILD_CROSS}" = "1" ]; then 117 if [ "${CRIO_BUILD_CROSS}" = "1" ]; then