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

Fix build tags for pkg/machine... #10634

Merged
merged 1 commit into from
Jun 10, 2021

Conversation

Luap99
Copy link
Member

@Luap99 Luap99 commented Jun 10, 2021

Podman machine is only intended for amd64 and arm64 architectures, set
the correct buildtags so that the pkg/machine, pkg/machine/qemu and
pkg/machine/libvirt packages compile correctly.

Fixes #10625

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 10, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Luap99

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 10, 2021
@Luap99
Copy link
Member Author

Luap99 commented Jun 10, 2021

@vrothberg @rhatdan @mheon @ashley-cui PTAL

Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

LGTM

Podman machine is only intended for amd64 and arm64 architectures, set
the correct buildtags so that the `pkg/machine`, `pkg/machine/qemu` and
`pkg/machine/libvirt` packages compile correctly.

[NO TESTS NEEDED]

Fixes containers#10625

Signed-off-by: Paul Holzinger <[email protected]>
Copy link
Member

@ashley-cui ashley-cui left a comment

Choose a reason for hiding this comment

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

I think commas are ANDs and spaces are OR's? So I think the build tags should be separated by spaces rather than commas, if I'm reading this correctly: https://golang.org/cmd/go/#hdr-Build_constraints

@Luap99
Copy link
Member Author

Luap99 commented Jun 10, 2021

No the build tags should be correct, they are the same as in /cmd/podman/machine.

@mheon
Copy link
Member

mheon commented Jun 10, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 10, 2021
@openshift-merge-robot openshift-merge-robot merged commit dffbf16 into containers:master Jun 10, 2021
@vrothberg
Copy link
Member

@Luap99, can you create a backport for the v3.2 branch?

@Luap99
Copy link
Member Author

Luap99 commented Jun 10, 2021

@mheon Should I open a PR to backport or do you include this in your final release PR?

@Luap99 Luap99 deleted the machine-build branch June 10, 2021 13:29
@ashley-cui
Copy link
Member

ashley-cui commented Jun 10, 2021

Oh duh, I read the build tags wrong, haven't had coffee this morning yet,my bad

@mheon
Copy link
Member

mheon commented Jun 10, 2021

@Luap99 I'll grab it - thanks for getting this one handled quickly.

@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 23, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

podman 3.2 fails to build from source (FTBFS) on all architectures that are not amd64, arm64
5 participants