SHA256
1
0
forked from pool/podman

Accepting request 1133976 from devel:microos

OBS-URL: https://build.opensuse.org/request/show/1133976
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/podman?expand=0&rev=122
This commit is contained in:
Ana Guerrero 2023-12-20 20:00:39 +00:00 committed by Git OBS Bridge
commit 5c90b2a82e
2 changed files with 14 additions and 11 deletions

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Dec 13 12:51:44 UTC 2023 - Fabian Vogt <fvogt@suse.com>
- Refactor network backend dependencies:
* podman requires either netavark or cni-plugins. On ALP, require
netavark, otherwise prefer netavark but don't force it.
* This fixes missing cni-plugins in some scenarios
* Default to netavark everywhere where it's available
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 11 16:13:48 UTC 2023 - kastl@b1-systems.de Mon Dec 11 16:13:48 UTC 2023 - kastl@b1-systems.de

View File

@ -52,20 +52,14 @@ Recommends: apparmor-parser
# requirement for `podman machine` # requirement for `podman machine`
Recommends: gvisor-tap-vsock Recommends: gvisor-tap-vsock
Requires: catatonit >= 0.1.7 Requires: catatonit >= 0.1.7
# provide both cni and netavark on TW # Needs a network backend
# but "prefer" netavark especially for Requires: (netavark or cni-plugins)
# fresh installations (bsc#1217828) # Force netavark on ALP
%if 0%{?suse_version} > 1600
Requires: (netavark or cni)
Suggests: netavark
%else
# default to Netavark on ALP
%if 0%{suse_version} >= 1600 && !0%{?is_opensuse} %if 0%{suse_version} >= 1600 && !0%{?is_opensuse}
Requires: netavark Requires: netavark
%else %else
Requires: cni # Prefer netavark for fresh installations (bsc#1217828)
Requires: cni-plugins Suggests: netavark
%endif
%endif %endif
Requires: conmon >= 2.0.24 Requires: conmon >= 2.0.24
Requires: fuse-overlayfs Requires: fuse-overlayfs