Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

vendor: bump github.com/vishvananda/netlink to fix build error on Darwin #1604

Merged
merged 1 commit into from
Jun 15, 2016

Conversation

dongsupark
Copy link
Contributor

@dongsupark dongsupark commented Jun 13, 2016

Bump vendor/github.com/vishvananda/netlink to commit 05415088e ("fix darwin build by moving code"), to fix build errors on Darwin hosts.
Also add vendor/github.com/vishvananda/netns for dependencies.

Fixes: #1603

/cc @ewoutp

@dongsupark
Copy link
Contributor Author

@ewoutp Can you please test the branch dongsu/netlink-fix-build-darwin to check if it builds without error?

@ewoutp
Copy link
Contributor

ewoutp commented Jun 13, 2016

Still getting a build error, but a different one, also in netlink.

$ ./build
Not on Linux - skipping fleetd build
Building fleetctl...
# github.com/coreos/fleet/vendor/github.com/vishvananda/netlink
gopath/src/github.com/coreos/fleet/vendor/github.com/vishvananda/netlink/filter.go:225: undefined: nl.TcPolice

@dongsupark
Copy link
Contributor Author

@ewoutp Hilarious. Then I have no idea.
This issue should be addressed by the netlink repo itself. Can you please report this bug on https://github.com/vishvananda/netlink/issues?
Thanks.

@ewoutp
Copy link
Contributor

ewoutp commented Jun 13, 2016

@dongsupark Thanks for trying.
Made the issue, see vishvananda/netlink#135.

@ewoutp
Copy link
Contributor

ewoutp commented Jun 15, 2016

There is now a PR in the netlink repo that fixes the issue, see vishvananda/netlink#138.

It is also suggested to include netlink only on linux, see vishvananda/netlink#135 (comment).

Bump vendor/github.com/vishvananda/netlink to commit 05415088e ("fix
darwin build by moving code"), to fix build errors on Darwin hosts.
Also add vendor/github.com/vishvananda/netns for dependencies.

Fixes: coreos#1603
@dongsupark dongsupark force-pushed the dongsu/netlink-fix-build-darwin branch from b75342f to 9a26136 Compare June 15, 2016 08:29
@dongsupark
Copy link
Contributor Author

@ewoutp Thanks for the report and feedback.
I updated my branch "dongsu/netlink-fix-build-darwin" to be in sync with "github.com/vishvananda/netlink/fix-darwin". So far it looks good. No build error, no regression.
Does this work for you too?

@ewoutp
Copy link
Contributor

ewoutp commented Jun 15, 2016

Build fine now, seems to work ok.
👍

@dongsupark
Copy link
Contributor Author

@ewoutp Cool, then I'll merge it soon.
BTW I also agree with the thought about "including netlink only on Linux", but I'll queue that issue to my to-do list for now.

@ewoutp
Copy link
Contributor

ewoutp commented Jun 15, 2016

Great. thx!

@dongsupark dongsupark merged commit c4393e9 into coreos:master Jun 15, 2016
@dongsupark
Copy link
Contributor Author

Merged #1604. Thanks.

@dongsupark dongsupark deleted the dongsu/netlink-fix-build-darwin branch June 16, 2016 08:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Master does not build (fleetctl) on GOOS=darwin
2 participants