Skip to content

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

Merged
vieux merged 3 commits intomoby:masterfrom
creack:remove_darwin_files
Jan 31, 2014
Merged

Remove all darwin specific files and use more generic _unsupported with build tags.#3857
vieux merged 3 commits intomoby:masterfrom
creack:remove_darwin_files

Conversation

@creack
Copy link
Copy Markdown
Contributor

@creack creack commented Jan 30, 2014

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

@tianon
Copy link
Copy Markdown
Member

tianon commented Jan 30, 2014

many big +1s

@tianon
Copy link
Copy Markdown
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
Copy link
Copy Markdown
Contributor Author

creack commented Jan 30, 2014

done

@tianon
Copy link
Copy Markdown
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?

…th build tags.

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
@tianon
Copy link
Copy Markdown
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
Copy link
Copy Markdown
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

😈

… 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)
@tianon
Copy link
Copy Markdown
Member

tianon commented Jan 31, 2014

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

@unclejack
Copy link
Copy Markdown
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

…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
@tianon
Copy link
Copy Markdown
Member

tianon commented Jan 31, 2014

@unclejack you should test it again now 👍

@unclejack
Copy link
Copy Markdown
Contributor

LGTM

@vieux
Copy link
Copy Markdown
Contributor

vieux commented Jan 31, 2014

LGTM tested on mac and linux

vieux added a commit that referenced this pull request Jan 31, 2014
Remove all darwin specific files and use more generic _unsupported with build tags.
@vieux vieux merged commit 523341d into moby:master Jan 31, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants