Skip to content

Commit

Permalink
cri-o: workaround failure since go upgraded to 1.13
Browse files Browse the repository at this point in the history
Source: meta-virtualization
MR: 00000
Type: Integration
Disposition: Merged from meta-virtualization
ChangeID: 00cc8af
Description:

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 <hongxu.jia@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
  • Loading branch information
hongxu-jia authored and jpuhlman committed Dec 2, 2019
1 parent 942d4df commit ed49273
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions recipes-containers/cri-o/cri-o_git.bb
Expand Up @@ -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
Expand Down

0 comments on commit ed49273

Please sign in to comment.