From fb456a9b8d1d6e70bb185a5df94060d438b0198c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 12 Sep 2023 14:33:47 -0400 Subject: [PATCH] rpm: gvforwarder subpackage This commit places the gvforwarder binary in a new gvforwarder subpackage. This subpackage will be a hard dependency for podman as its required in FCOS. This subpackage will also be a hard dependency for the main package to preserve upgrade path. Signed-off-by: Lokesh Mandvekar --- rpm/gvisor-tap-vsock.spec | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/rpm/gvisor-tap-vsock.spec b/rpm/gvisor-tap-vsock.spec index 69d7656c1..63df9d348 100644 --- a/rpm/gvisor-tap-vsock.spec +++ b/rpm/gvisor-tap-vsock.spec @@ -11,6 +11,8 @@ %global _gvisor_installdir %{_libexecdir}/podman +%global desc_gvforwarder Forward traffic from a tap interface over vsock + Name: gvisor-tap-vsock %if %{defined copr_username} Epoch: 103 @@ -57,6 +59,7 @@ Obsoletes: podman-gvproxy < 102:4.7.0-1 Obsoletes: podman-gvproxy < 5:4.7.0-1 %endif Provides: podman-gvproxy = %{epoch}:%{version}-%{release} +Requires: %{name}-gvforwarder = %{epoch}:%{version}-%{release} %description A replacement for libslirp and VPNKit, written in pure Go. @@ -64,6 +67,13 @@ It is based on the network stack of gVisor. Compared to libslirp, gvisor-tap-vsock brings a configurable DNS server and dynamic port forwarding. +%package gvforwarder +Summary: %{desc_gvforwarder} +Provides: gvforwarder = %{epoch}:%{version}-%{release} + +%description +%{desc_gvforwarder} + %prep %autosetup -Sgit -n %{name}-%{version} @@ -101,6 +111,9 @@ install -p -m0755 bin/gvforwarder %{buildroot}%{_gvisor_installdir} %doc README.md %dir %{_gvisor_installdir} %{_gvisor_installdir}/gvproxy + +%files gvforwarder +%dir %{_gvisor_installdir} %{_gvisor_installdir}/gvforwarder %changelog