Skip to content
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

Makefile: tweak the cross-compile target #2652

Merged
merged 1 commit into from
Sep 24, 2020
Merged

Conversation

nalind
Copy link
Member

@nalind nalind commented Sep 24, 2020

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

What go tool dist list says the toolchain supports changes, so this change removes these attempted cross-compile build targets.

  • GOOS=darwin, GOARCH unspecified build
  • GOOS=darwin, GOARCH=386 build

Replace our use of slices of github.com/opencontainers/runc/libcontainer/configs.Device structures with a locally-defined type alias so that we can avoid importing the package on non-Unixy systems. The result is not going to be a very useful binary on non-Linux systems, but it helps ensure that our subpackages won't break compilation for other projects who consume us as a library.

How to verify it

CI all the way.

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

Don't try to actually run the non-Linux binaries.

Does this PR introduce a user-facing change?

None

What `go tool dist list` says the toolchain supports changes, so this
change removes these attempted cross-compile build targets.
* GOOS=darwin, GOARCH unspecified
* GOOS=darwin, GOARCH=386

Replace our use of slices of
github.com/opencontainers/runc/libcontainer/configs.Device structures
with a locally-defined type alias so that we can avoid importing the
package on non-Unixy systems.  The result is not going to be a very
useful binary on non-Linux systems, but it helps ensure that our
subpackages won't break compilation for other projects who consume us as
a library.

Signed-off-by: Nalin Dahyabhai <[email protected]>
@rhatdan
Copy link
Member

rhatdan commented Sep 24, 2020

LGTM

Copy link
Member

@TomSweeneyRedHat TomSweeneyRedHat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@TomSweeneyRedHat
Copy link
Member

bors r+

@bors
Copy link
Contributor

bors bot commented Sep 24, 2020

Build succeeded:

@bors bors bot merged commit 2d715d1 into containers:master Sep 24, 2020
@nalind nalind deleted the cross-tweaks branch September 24, 2020 20:12
kolyshkin added a commit to kolyshkin/runc that referenced this pull request Dec 3, 2020
This was initially added by commit d78ee47 but later
moved from libcontainer/configs to libcontainer/devices by
commit 677baf2.

Looks like since commit 677baf2 and also [1]
there is no use for this, thus removing.

[1] containers/buildah#2652
igned-off-by: Kir Kolyshkin <[email protected]>
kolyshkin added a commit to kolyshkin/runc that referenced this pull request Dec 3, 2020
This was initially added by commit d78ee47 but later
moved from libcontainer/configs to libcontainer/devices by
commit 677baf2.

Looks like since commit 677baf2 and also [1]
there is no use for this, thus removing.

[1] containers/buildah#2652

Signed-off-by: Kir Kolyshkin <[email protected]>
kolyshkin added a commit to kolyshkin/runc that referenced this pull request Dec 3, 2020
This was initially added by commit d78ee47 but later
moved from libcontainer/configs to libcontainer/devices by
commit 677baf2.

Looks like since commit 677baf2 and also [1]
there is no use for this, thus removing.

[1] containers/buildah#2652

Signed-off-by: Kir Kolyshkin <[email protected]>
kolyshkin added a commit to kolyshkin/runc that referenced this pull request Jan 6, 2021
This was initially added by commit d78ee47 but later
moved from libcontainer/configs to libcontainer/devices by
commit 677baf2.

Looks like since commit 677baf2 and also [1]
there is no use for this, thus removing.

[1] containers/buildah#2652

Signed-off-by: Kir Kolyshkin <[email protected]>
thaJeztah pushed a commit to thaJeztah/runc that referenced this pull request Apr 2, 2021
This was initially added by commit d78ee47 but later
moved from libcontainer/configs to libcontainer/devices by
commit 677baf2.

Looks like since commit 677baf2 and also [1]
there is no use for this, thus removing.

[1] containers/buildah#2652

Signed-off-by: Kir Kolyshkin <[email protected]>
AdamKorcz pushed a commit to AdamKorcz/runc that referenced this pull request May 22, 2021
This was initially added by commit d78ee47 but later
moved from libcontainer/configs to libcontainer/devices by
commit 677baf2.

Looks like since commit 677baf2 and also [1]
there is no use for this, thus removing.

[1] containers/buildah#2652

Signed-off-by: Kir Kolyshkin <[email protected]>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 29, 2023
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.

3 participants