neels has uploaded this change for review.

View Change

debian packaging of libosmo-gtlv and libosmo-pfcp

Fix debian packaging, so far a copy-paste from osmo-upf.git crept in
here by accident.

Related: SYS#5895
Change-Id: Id7169fc67b4f8f77dfbeff9f199e6557ced67a53
---
M debian/changelog
M debian/compat
M debian/control
M debian/copyright
A debian/libosmo-gtlv0.install
R debian/libosmo-pfcp0.install
M debian/rules
M tests/libosmo-pfcp/Makefile.am
8 files changed, 96 insertions(+), 32 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/05/29005/1
diff --git a/debian/changelog b/debian/changelog
index e69de29..e16e70f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+libosmo-pfcp (0.1.0) testing; urgency=low
+
+ Create new Debian package.
+
+ -- Neels Hofmeyr <nhofmeyr@sysmocom.de> Tue, 9 Aug 2022 18:29:05 +0200
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 04b8224..fe370e0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
-Source: osmo-upf
-Section: net
-Priority: extra
-Maintainer: Osmocom team <openbsc@lists.osmocom.org>
-Build-Depends: debhelper (>=9),
+Source: libosmo-pfcp
+Section: libs
+Priority: optional
+Maintainer: Osmocom team <osmocom-net-gprs@lists.osmocom.org>
+Build-Depends: debhelper (>=10),
dh-autoreconf,
autotools-dev,
autoconf,
@@ -11,32 +11,89 @@
libtool,
pkg-config,
python3-minimal,
- libtalloc-dev,
- libosmocore-dev (>= 1.6.0),
- osmo-gsm-manuals-dev (>= 1.2.0)
+ libosmocore-dev (>= 1.7.0),
+ libtalloc-dev (>= 2.1.0)
Standards-Version: 3.9.8
-Vcs-Git: git://git.osmocom.org/osmo-upf.git
-Vcs-Browser: https://git.osmocom.org/osmo-upf/
-Homepage: https://projects.osmocom.org/projects/osmo-upf
+Vcs-Git: git://git.osmocom.org/libosmo-pfcp.git
+Vcs-Browser: https://git.osmocom.org/libosmo-pfcp/
+Homepage: https://projects.osmocom.org/projects/libosmo-pfcp

-Package: osmo-upf
+Package: libosmo-pfcp
+Section: libs
Architecture: any
Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: OsmoUPF: Osmocom User Plane Function
+Depends: ${misc:Depends},
+ libosmo-gtlv0 (= ${binary:Version}),
+ libosmo-pfcp0 (= ${binary:Version})
+Description: Osmocom PFCP protocol implementation (metapackage)
+ Install Osmocom PFCP and generic TLV protocol libraries.

-Package: osmo-upf-dbg
-Section: debug
+Package: libosmo-gtlv0
+Section: libs
Architecture: any
Multi-Arch: same
-Depends: osmo-upf (= ${binary:Version}), ${misc:Depends}
-Description: OsmoUPF: Osmocom User Plane Function
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libosmocore-dev (>= 1.7.0),
+ libtalloc-dev (>= 2.1.0)
+Pre-Depends: ${misc:Pre-Depends}
+Description: Generic TLV and TLIV protocol support
+ Decoding, encoding and logging of protocols using a Tag-Length-Value and/or
+ Tag-Length-Instance-Value structure.

-Package: osmo-upf-doc
-Architecture: all
-Section: doc
-Priority: optional
-Depends: ${misc:Depends}
-Description: ${misc:Package} PDF documentation
- Various manuals: user manual, VTY reference manual and/or
- protocol/interface manuals.
+Package: libosmo-gtlv-dev
+Architecture: any
+Multi-Arch: same
+Section: libdevel
+Depends: ${misc:Depends},
+ libosmo-gtlv0 (= ${binary:Version})
+Description: Development headers for libosmo-gtlv
+ libosmo-gtlv implements decoding, encoding and logging of protocols using a
+ Tag-Length-Value and/or Tag-Length-Instance-Value structure. This package in
+ particular contains the files for compiling a program using this library.
+
+Package: libosmo-gtlv-dbg
+Architecture: any
+Multi-Arch: same
+Section: debug
+Priority: extra
+Depends: ${misc:Depends},
+ libosmo-gtlv0 (= ${binary:Version})
+Description: Debug symbols for libosmo-gtlv
+ libosmo-gtlv implements decoding, encoding and logging of protocols using a
+ Tag-Length-Value and/or Tag-Length-Instance-Value structure. This package in
+ particular contains the debug symbols for this library.
+
+Package: libosmo-pfcp0
+Section: libs
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Description: PFCP protocol support
+ Decoding, encoding and endpoint implementation of the Packet Forwarding Control Protocol
+ (3GPP TS 29.244).
+
+Package: libosmo-pfcp-dev
+Architecture: any
+Multi-Arch: same
+Section: libdevel
+Depends: ${misc:Depends},
+ libosmo-pfcp0 (= ${binary:Version})
+Description: Development headers for libosmo-pfcp
+ libosmo-pfcp implements decoding, encoding and endpoint implementation of the
+ Packet Forwarding Control Protocol (3GPP TS 29.244). This package in particular
+ contains the files for compiling a program using this library.
+
+Package: libosmo-pfcp-dbg
+Architecture: any
+Multi-Arch: same
+Section: debug
+Priority: extra
+Depends: ${misc:Depends},
+ libosmo-pfcp0 (= ${binary:Version})
+Description: Debug symbols for libosmo-pfcp
+ libosmo-pfcp implements decoding, encoding and endpoint implementation of the
+ Packet Forwarding Control Protocol (3GPP TS 29.244). This package in particular
+ contains the debug symbols for this library.
diff --git a/debian/copyright b/debian/copyright
index 84c249f..aa284b9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: osmo-upf
-Source: git://git.osmocom.org/osmo-upf
+Upstream-Name: libosmo-pfcp
+Source: git://git.osmocom.org/libosmo-pfcp

Files: *
-Copyright: 2021-2022 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
+Copyright: 2022 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
License: AGPL-3.0+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
diff --git a/debian/libosmo-gtlv0.install b/debian/libosmo-gtlv0.install
new file mode 100644
index 0000000..dba9905
--- /dev/null
+++ b/debian/libosmo-gtlv0.install
@@ -0,0 +1 @@
+usr/lib/*/libosmo-gtlv*.so.*
diff --git a/debian/libosmo-pfcp.install b/debian/libosmo-pfcp0.install
similarity index 100%
rename from debian/libosmo-pfcp.install
rename to debian/libosmo-pfcp0.install
diff --git a/debian/rules b/debian/rules
index b206acd..e32eb67 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,8 @@

# See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg
override_dh_strip:
- dh_strip -plibosmo-pfcp --dbg-package=libosmo-pfcp-dbg
+ dh_strip -plibosmo-gtlv0 --dbg-package=libosmo-gtlv-dbg
+ dh_strip -plibosmo-pfcp0 --dbg-package=libosmo-pfcp-dbg

# Print test results in case of a failure
override_dh_auto_test:
diff --git a/tests/libosmo-pfcp/Makefile.am b/tests/libosmo-pfcp/Makefile.am
index a2bcdf6..6f3eca1 100644
--- a/tests/libosmo-pfcp/Makefile.am
+++ b/tests/libosmo-pfcp/Makefile.am
@@ -23,8 +23,8 @@

pfcp_test_LDADD = \
$(LIBOSMOCORE_LIBS) \
- $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.la \
$(top_builddir)/src/libosmo-pfcp/libosmo-pfcp.la \
+ $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.la \
$(NULL)

.PHONY: update_exp

To view, visit change 29005. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: libosmo-pfcp
Gerrit-Branch: master
Gerrit-Change-Id: Id7169fc67b4f8f77dfbeff9f199e6557ced67a53
Gerrit-Change-Number: 29005
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr@sysmocom.de>
Gerrit-MessageType: newchange