/moby

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove all darwin specific files and use more generic _unsupported with build tags. #3857

Merged
merged 3 commits into from Jan 31, 2014

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@creack @tianon @unclejack @vieux
@creack
Contributor

creack commented Jan 30, 2014

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes guillaume.charmes@docker.com (github: creack)
@tianon

This comment has been minimized.

Show comment
Hide comment
@tianon

tianon Jan 30, 2014

Member

many big +1s
Member

tianon commented Jan 30, 2014

many big +1s
@tianon

This comment has been minimized.

Show comment
Hide comment
@tianon

tianon Jan 30, 2014

Member

If you swap !linux with !linux,amd64 we can probably enable cross compiling for i386 and arm even.
Member

tianon commented Jan 30, 2014

If you swap !linux with !linux,amd64 we can probably enable cross compiling for i386 and arm even.
@creack

This comment has been minimized.

Show comment
Hide comment
@creack

creack Jan 30, 2014

Contributor

done
Contributor

creack commented Jan 30, 2014

done
@tianon

This comment has been minimized.

Show comment
Hide comment
@tianon

tianon Jan 30, 2014

Member

Shoot, I told you wrong - reading the docs it should be !linux !amd64 (I think) - http://golang.org/pkg/go/build/#hdr-Build_Constraints

My brain is fried I think; can someone else verify my broken logic?
Member

tianon commented Jan 30, 2014

Shoot, I told you wrong - reading the docs it should be !linux !amd64 (I think) - http://golang.org/pkg/go/build/#hdr-Build_Constraints

My brain is fried I think; can someone else verify my broken logic?
@creack
Remove all darwin specific files and use more generic _unsupported wi… 
…th build tags.

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
45dd051
@tianon

This comment has been minimized.

Show comment
Hide comment
@tianon

tianon Jan 31, 2014

Member

Closes #2544

(in which I had already figured out the necessary flags - I'm updating the files here to actually compile properly and include cross-compiling for linux/arm and linux/i386, and will black-market PR my changes when I'm finished)
Member

tianon commented Jan 31, 2014

Closes #2544

(in which I had already figured out the necessary flags - I'm updating the files here to actually compile properly and include cross-compiling for linux/arm and linux/i386, and will black-market PR my changes when I'm finished)
@tianon

This comment has been minimized.

Show comment
Hide comment
@tianon

tianon Jan 31, 2014

Member 
---> Making bundle: binary (in bundles/0.7.6-dev/binary)
Created binary: /go/src/github.com/dotcloud/docker/bundles/0.7.6-dev/binary/docker-0.7.6-dev

---> Making bundle: cross (in bundles/0.7.6-dev/cross)
Created symlinks: /go/src/github.com/dotcloud/docker/bundles/0.7.6-dev/cross/linux/amd64/docker-0.7.6-dev
Created binary: /go/src/github.com/dotcloud/docker/bundles/0.7.6-dev/cross/linux/386/docker-0.7.6-dev
Created binary: /go/src/github.com/dotcloud/docker/bundles/0.7.6-dev/cross/linux/arm/docker-0.7.6-dev
Created binary: /go/src/github.com/dotcloud/docker/bundles/0.7.6-dev/cross/darwin/amd64/docker-0.7.6-dev
Created binary: /go/src/github.com/dotcloud/docker/bundles/0.7.6-dev/cross/darwin/386/docker-0.7.6-dev

😈
Member

tianon commented Jan 31, 2014 

---> Making bundle: binary (in bundles/0.7.6-dev/binary)
Created binary: /go/src/github.com/dotcloud/docker/bundles/0.7.6-dev/binary/docker-0.7.6-dev

---> Making bundle: cross (in bundles/0.7.6-dev/cross)
Created symlinks: /go/src/github.com/dotcloud/docker/bundles/0.7.6-dev/cross/linux/amd64/docker-0.7.6-dev
Created binary: /go/src/github.com/dotcloud/docker/bundles/0.7.6-dev/cross/linux/386/docker-0.7.6-dev
Created binary: /go/src/github.com/dotcloud/docker/bundles/0.7.6-dev/cross/linux/arm/docker-0.7.6-dev
Created binary: /go/src/github.com/dotcloud/docker/bundles/0.7.6-dev/cross/darwin/amd64/docker-0.7.6-dev
Created binary: /go/src/github.com/dotcloud/docker/bundles/0.7.6-dev/cross/darwin/386/docker-0.7.6-dev

😈
@tianon
Update/fix build tags, Dockerfile, and release.sh for proper building… 
… and releasing of linux/386 and linux/arm cross-compiled client binaries

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
065dd23
@tianon

This comment has been minimized.

Show comment
Hide comment
@tianon

tianon Jan 31, 2014

Member

See creack#4 for the black-market PR >:)
Member

tianon commented Jan 31, 2014

See creack#4 for the black-market PR >:)
@unclejack

This comment has been minimized.

Show comment
Hide comment
@unclejack

unclejack Jan 31, 2014

Contributor

@creack I'm getting this when running make.sh:

---> Making bundle: binary (in bundles/0.7.6-dev/binary)
# github.com/dotcloud/docker/pkg/mount
pkg/mount/flags_unsupported.go:4: parseOptions redeclared in this block
        previous declaration at pkg/mount/flags_linux.go:10
pkg/mount/mounter_unsupported.go:4: mount redeclared in this block
        previous declaration at pkg/mount/mounter_linux.go:7
pkg/mount/mounter_unsupported.go:8: unmount redeclared in this block
        previous declaration at pkg/mount/mounter_linux.go:19
# github.com/dotcloud/docker/pkg/netlink
pkg/netlink/netlink_unsupported.go:9: NetworkGetRoutes redeclared in this block
        previous declaration at pkg/netlink/netlink_linux.go:476
pkg/netlink/netlink_unsupported.go:13: NetworkLinkAdd redeclared in this block
        previous declaration at pkg/netlink/netlink_linux.go:445
pkg/netlink/netlink_unsupported.go:17: NetworkLinkUp redeclared in this block
        previous declaration at pkg/netlink/netlink_linux.go:334
pkg/netlink/netlink_unsupported.go:21: NetworkLinkAddIp redeclared in this block
        previous declaration at pkg/netlink/netlink_linux.go:389
pkg/netlink/netlink_unsupported.go:25: AddDefaultGw redeclared in this block
        previous declaration at pkg/netlink/netlink_linux.go:301
pkg/netlink/netlink_unsupported.go:30: NetworkSetMTU redeclared in this block
        previous declaration at pkg/netlink/netlink_linux.go:356
# github.com/dotcloud/docker/utils
utils/uname_unsupported.go:8: Utsname redeclared in this block
        previous declaration at utils/uname_linux.go:7
utils/uname_unsupported.go:12: uname redeclared in this block
        previous declaration at utils/uname_linux.go:9
Contributor

unclejack commented Jan 31, 2014

@creack I'm getting this when running make.sh:

---> Making bundle: binary (in bundles/0.7.6-dev/binary)
# github.com/dotcloud/docker/pkg/mount
pkg/mount/flags_unsupported.go:4: parseOptions redeclared in this block
        previous declaration at pkg/mount/flags_linux.go:10
pkg/mount/mounter_unsupported.go:4: mount redeclared in this block
        previous declaration at pkg/mount/mounter_linux.go:7
pkg/mount/mounter_unsupported.go:8: unmount redeclared in this block
        previous declaration at pkg/mount/mounter_linux.go:19
# github.com/dotcloud/docker/pkg/netlink
pkg/netlink/netlink_unsupported.go:9: NetworkGetRoutes redeclared in this block
        previous declaration at pkg/netlink/netlink_linux.go:476
pkg/netlink/netlink_unsupported.go:13: NetworkLinkAdd redeclared in this block
        previous declaration at pkg/netlink/netlink_linux.go:445
pkg/netlink/netlink_unsupported.go:17: NetworkLinkUp redeclared in this block
        previous declaration at pkg/netlink/netlink_linux.go:334
pkg/netlink/netlink_unsupported.go:21: NetworkLinkAddIp redeclared in this block
        previous declaration at pkg/netlink/netlink_linux.go:389
pkg/netlink/netlink_unsupported.go:25: AddDefaultGw redeclared in this block
        previous declaration at pkg/netlink/netlink_linux.go:301
pkg/netlink/netlink_unsupported.go:30: NetworkSetMTU redeclared in this block
        previous declaration at pkg/netlink/netlink_linux.go:356
# github.com/dotcloud/docker/utils
utils/uname_unsupported.go:8: Utsname redeclared in this block
        previous declaration at utils/uname_linux.go:7
utils/uname_unsupported.go:12: uname redeclared in this block
        previous declaration at utils/uname_linux.go:9
@creack
Merge pull request #4 from tianon/cross-compile-and-release-linux-i38… 
…6-and-arm-clients

Update/fix build tags, Dockerfile, and release.sh for proper building and releasing of linux/386 and linux/arm cross-compiled client binaries
ff64093
@tianon

This comment has been minimized.

Show comment
Hide comment
@tianon

tianon Jan 31, 2014

Member

@unclejack you should test it again now 👍
Member

tianon commented Jan 31, 2014

@unclejack you should test it again now 👍
@unclejack

This comment has been minimized.

Show comment
Hide comment
@unclejack

unclejack Jan 31, 2014

Contributor

LGTM
Contributor

unclejack commented Jan 31, 2014

LGTM
@vieux

This comment has been minimized.

Show comment
Hide comment
@vieux

vieux Jan 31, 2014

Collaborator

LGTM tested on mac and linux
Collaborator

vieux commented Jan 31, 2014

LGTM tested on mac and linux

vieux added a commit that referenced this pull request Jan 31, 2014

@vieux
Merge pull request #3857 from creack/remove_darwin_files 
Remove all darwin specific files and use more generic _unsupported with build tags.
523341d

@vieux vieux merged commit 523341d into moby:master Jan 31, 2014
1 check passed

1 check passed

default The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment