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.

Sign up for GitHub

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

Jump to bottom

Add non-linux build stubs for libpod #15357

Merged
merged 3 commits into from
Aug 17, 2022
Merged

Add non-linux build stubs for libpod #15357

merged 3 commits into from
Aug 17, 2022

Conversation

dfr
Copy link
Contributor

@dfr dfr commented Aug 17, 2022

This also moves some rootless network setup code and uses of unix.O_PATH to container_internal_linux.go. With this, it is possible to build a non-functional podman on FreeBSD.

Possibly networking_slirp4netns.go would be a more suitable place for the rootless network code.

Does this PR introduce a user-facing change?

None

@dfr
libpod: Add stubs for non-linux builds
1b88927 
Note: this makes info.go linux-only since it mixes linux-specific and
generic code. This should be addressed in a separate refactoring PR.

[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <[email protected]>
giuseppe
giuseppe approved these changes Aug 17, 2022
View reviewed changes
Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

LGTM

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 17, 2022
dfr added 2 commits August 17, 2022 12:55
@dfr
libpod: Move rootless network setup details to container_internal_lin…
5d77784 
…ux.go

This removes a use of state.NetNS which is a linux-specific field defined
in container_linux.go from the generic container_internal.go, allowing
that to build on non-linux platforms.

[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <[email protected]>
@dfr
libpod: Move uses of unix.O_PATH to container_internal_linux.go
1572420 
The O_PATH flag is a recent addition to the open syscall and is not
present in darwin or in FreeBSD releases before 13.1. The constant is
not present in the FreeBSD version of x/sys/unix since that package
supports FreeBSD 12.3 and later.

[NO NEW TESTS NEEDED]

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

rhatdan commented Aug 17, 2022

/lgtm
/approve
/hold # Merge if tests pass.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 17, 2022
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 17, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 17, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dfr, giuseppe, rhatdan

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

@rhatdan
Copy link
Member

rhatdan commented Aug 17, 2022

If this will compile in freebsd mode, you should turn on the cross compile check.

@dfr
Copy link
Contributor Author

dfr commented Aug 17, 2022

If this will compile in freebsd mode, you should turn on the cross compile check.

I was planning to wait until I have basic functionality (e.g. container management, networking etc.) moved across from the prototype but that is several PRs into the future. I don't want to block linux PRs while the port is not even functional.

@mheon
Copy link
Member

mheon commented Aug 17, 2022

LGTM for the record

@rhatdan
Copy link
Member

rhatdan commented Aug 17, 2022

/hold cancel
I was just thinking we could block PRs which will easily break FreeBSD. I don't believe this would be a burden and we could quickly revert it if it becomes an issue.

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 17, 2022
@openshift-merge-robot openshift-merge-robot merged commit c2f9ab1 into containers:main Aug 17, 2022
@dfr
Copy link
Contributor Author

dfr commented Aug 17, 2022

/hold cancel
I was just thinking we could block PRs which will easily break FreeBSD. I don't believe this would be a burden and we could quickly revert it if it becomes an issue.

Good point. Unfortunately the freebsd non-cgo build is already broken - godbus/dbus/v5 doesn't build without cgo :(

@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 20, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 20, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@giuseppe giuseppe giuseppe approved these changes

Assignees

@rhatdan rhatdan

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. release-note-none
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dfr @rhatdan @mheon @giuseppe @openshift-merge-robot