neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/29142 )

Change subject: debian,RPM,configure: fix packaging (deps etc) ......................................................................

debian,RPM,configure: fix packaging (deps etc)

Related: SYS#5599 Change-Id: I068736d513ddb54b9a62c1d7970a0fbff3095b4b --- M configure.ac M contrib/osmo-upf.spec.in M debian/control 3 files changed, 5 insertions(+), 4 deletions(-)

Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved

diff --git a/configure.ac b/configure.ac index 18e8d6b..b89c175 100644 --- a/configure.ac +++ b/configure.ac @@ -39,10 +39,8 @@ PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) -PKG_CHECK_MODULES(LIBOSMOGTLV, libosmo-gtlv >= 0.1.0) PKG_CHECK_MODULES(LIBOSMOPFCP, libosmo-pfcp >= 0.1.0) PKG_CHECK_MODULES(LIBGTPNL, libgtpnl >= 1.2.0) -PKG_CHECK_MODULES(LIBNFTNL, libnftnl >= 1.2.1) PKG_CHECK_MODULES(LIBNFTABLES, libnftables >= 1.0.2)

dnl checks for header files diff --git a/contrib/osmo-upf.spec.in b/contrib/osmo-upf.spec.in index fc9b7ea..772db85 100644 --- a/contrib/osmo-upf.spec.in +++ b/contrib/osmo-upf.spec.in @@ -33,10 +33,10 @@ BuildRequires: systemd-rpm-macros %endif BuildRequires: pkgconfig(libgtpnl) >= 1.2.0 +BuildRequires: pkgconfig(libnftables) >= 1.0.2 BuildRequires: pkgconfig(libosmocore) >= 1.6.0 BuildRequires: pkgconfig(libosmoctrl) >= 1.6.0 BuildRequires: pkgconfig(libosmovty) >= 1.6.0 -BuildRequires: pkgconfig(libosmo-gtlv) >= 0.1.0 BuildRequires: pkgconfig(libosmo-pfcp) >= 0.1.0 BuildRequires: pkgconfig(talloc) %{?systemd_requires} @@ -79,9 +79,12 @@ %license COPYING %doc AUTHORS README.md %{_bindir}/osmo-upf +%{_bindir}/osmo-pfcp-tool %dir %{_docdir}/%{name}/examples %dir %{_docdir}/%{name}/examples/osmo-upf %{_docdir}/%{name}/examples/osmo-upf/osmo-upf.cfg +%{_docdir}/%{name}/examples/osmo-upf/osmo-upf-create-dev.cfg +%{_docdir}/%{name}/examples/osmo-upf/osmo-upf-mockup.cfg %dir %{_sysconfdir}/osmocom %config(noreplace) %{_sysconfdir}/osmocom/osmo-upf.cfg %{_unitdir}/%{name}.service diff --git a/debian/control b/debian/control index b32a95e..12d35da 100644 --- a/debian/control +++ b/debian/control @@ -13,8 +13,8 @@ python3-minimal, libtalloc-dev, libgtpnl-dev (>= 1.2.0), + libnftables-dev (>= 1.0.2), libosmocore-dev (>= 1.6.0), - libosmo-gtlv-dev (>= 0.1.0), libosmo-pfcp-dev (>= 0.1.0), osmo-gsm-manuals-dev (>= 1.2.0) Standards-Version: 3.9.8