Make Fedora dependencies Fedora-only #2081
Conversation
|
We were not able to find or create Copr project Please check your configuration for:
|
|
/packit build |
|
Needs DCO. |
| Requires: iptables | ||
| Requires: nftables | ||
| Requires: passt | ||
| %if %{defined fedora} | ||
| Conflicts: podman < 5:5.0.0~rc4-1 | ||
| Recommends: composefs | ||
| Recommends: crun |
There was a problem hiding this comment.
The crun and netavark dependencies are already handled by the global:
Requires: oci-runtime
Requires: container-network-stack
so we should be fine with having crun and netavark inside Fedora, so people can use runc, cni if they want.
There was a problem hiding this comment.
Sure, but the Recommends will pull in crun and netavark by default, while the oci-runtime and container-network-stack are potentially random. Having recommends does not prevent the use of cni or runc.
There was a problem hiding this comment.
@rhatdan for RHEL10 runc and cni is gone - it is no longer available there.
| Requires: iptables | ||
| Requires: nftables | ||
| Requires: passt | ||
| %if %{defined fedora} | ||
| Conflicts: podman < 5:5.0.0~rc4-1 | ||
| Recommends: composefs | ||
| Recommends: crun | ||
| Requires: (crun if fedora-release-identity-server) | ||
| Requires: netavark >= %{netavark_epoch}:1.10.3-1 |
rpm/containers-common.spec
Outdated
| @@ -85,19 +85,21 @@ Summary: Extra dependencies for Podman and Buildah | |||
| Requires: %{name} = %{epoch}:%{version}-%{release} | |||
| Requires: container-network-stack | |||
| Requires: oci-runtime | |||
| Requires: iptables | |||
There was a problem hiding this comment.
iptables dep should be dropped from RHEL/centos 10 as netavark must default to nftables. The iptables kernel modules were dropped anyway so it does not run correctly (https://issues.redhat.com/browse/RHEL-32374)
And thinking about this podman/containers-common does not use the nftables/iptables dep at all so shouldn't they be listed on netavark instead?
There was a problem hiding this comment.
I can drop nftables/iptables from the spec once a PR is merged to the netavark spec upstream first if you don't mind. I mean - I wouldn't block this PR for now but will do another one once netvark spec is updated upstream - if you are fine with that.
There was a problem hiding this comment.
btw. I just moved the iptables dep to Fedora section for now.
There was a problem hiding this comment.
Yeah I am fine to not move it in this PR.
But I don't see the fedora only change pushed here.
There was a problem hiding this comment.
My bad - just force pushed the change now.
Signed-off-by: Jindrich Novy <[email protected]>
|
LGTM |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jnovy, lsm5, 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 |
No description provided.