Skip to content

Commit 00cc8af

Browse files
hongxu-jiazeddii
authored andcommitted
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] golang/go#34068 Signed-off-by: Hongxu Jia <[email protected]> Signed-off-by: Bruce Ashfield <[email protected]>
1 parent 7d13954 commit 00cc8af

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

recipes-containers/cri-o/cri-o_git.bb

+3
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,9 @@ do_compile() {
109109
# fixes the bin/crio build of oe_runmake binaries below
110110
ln -sf ../../../../cmd/crio ${S}/src/import/src/github.com/cri-o/cri-o/cmd/
111111

112+
# workaround `use of vendored package not allowed' failure
113+
mv ${S}/src/import/vendor/golang.org ${S}/src/import/
114+
112115
cd ${S}/src/import
113116

114117
if [ "${CRIO_BUILD_CROSS}" = "1" ]; then

0 commit comments

Comments
 (0)