<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-iuh/+/25880">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Provide libosmo-hnbap as a public shared library<br><br>It is needed by the new osmo-hnodeb project.<br><br>Change-Id: I0d0862e9d59d3b206f3f7dfae4b39ae4032bb762<br>---<br>M Makefile.am<br>M configure.ac<br>M contrib/osmo-iuh.spec.in<br>M debian/control<br>A debian/libosmo-hnbap-dev.install<br>A debian/libosmo-hnbap0.install<br>M debian/rules<br>M include/osmocom/hnbap/Makefile.am<br>A libosmo-hnbap.pc.in<br>M src/Makefile.am<br>M src/hnbap/Makefile.am<br>M src/ranap/Makefile.am<br>M src/tests/Makefile.am<br>13 files changed, 82 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/80/25880/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Makefile.am b/Makefile.am</span><br><span>index fd684e7..1dc00d6 100644</span><br><span>--- a/Makefile.am</span><br><span>+++ b/Makefile.am</span><br><span>@@ -3,7 +3,7 @@</span><br><span> SUBDIRS = src include doc contrib</span><br><span> </span><br><span> pkgconfigdir = $(libdir)/pkgconfig</span><br><span style="color: hsl(0, 100%, 40%);">-pkgconfig_DATA = libosmo-ranap.pc libosmo-sabp.pc</span><br><span style="color: hsl(120, 100%, 40%);">+pkgconfig_DATA = libosmo-hnbap.pc libosmo-ranap.pc libosmo-sabp.pc</span><br><span> </span><br><span> EXTRA_DIST = \</span><br><span>             .version \</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index e2d9f56..93c5bb1 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -150,6 +150,7 @@</span><br><span> AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])</span><br><span> </span><br><span> AC_OUTPUT(</span><br><span style="color: hsl(120, 100%, 40%);">+       libosmo-hnbap.pc</span><br><span>     libosmo-ranap.pc</span><br><span>     libosmo-sabp.pc</span><br><span>      src/Makefile</span><br><span>diff --git a/contrib/osmo-iuh.spec.in b/contrib/osmo-iuh.spec.in</span><br><span>index c8bdea2..592b168 100644</span><br><span>--- a/contrib/osmo-iuh.spec.in</span><br><span>+++ b/contrib/osmo-iuh.spec.in</span><br><span>@@ -42,6 +42,21 @@</span><br><span> %description</span><br><span> Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+%package -n libosmo-hnbap0</span><br><span style="color: hsl(120, 100%, 40%);">+Summary:        Shared Library part of libosmo-hnbap</span><br><span style="color: hsl(120, 100%, 40%);">+Group:          System/Libraries</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+%description -n libosmo-hnbap0</span><br><span style="color: hsl(120, 100%, 40%);">+Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+%package -n libosmo-hnbap-devel</span><br><span style="color: hsl(120, 100%, 40%);">+Summary:        Development files for Osmocom HNBAP library</span><br><span style="color: hsl(120, 100%, 40%);">+Group:          Development/Libraries/C and C++</span><br><span style="color: hsl(120, 100%, 40%);">+Requires:       libosmo-hnbap0 = %{version}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+%description -n libosmo-hnbap-devel</span><br><span style="color: hsl(120, 100%, 40%);">+Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> %package -n libosmo-ranap3</span><br><span> Summary:        Shared Library part of libosmo-ranap</span><br><span> Group:          System/Libraries</span><br><span>@@ -121,6 +136,14 @@</span><br><span> %config %{_sysconfdir}/osmocom/osmo-hnbgw.cfg</span><br><span> %{_unitdir}/osmo-hnbgw.service</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+%files -n libosmo-hnbap0</span><br><span style="color: hsl(120, 100%, 40%);">+%{_libdir}/libosmo-hnbap.so.0*</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+%files -n libosmo-hnbap-devel</span><br><span style="color: hsl(120, 100%, 40%);">+%{_includedir}/*</span><br><span style="color: hsl(120, 100%, 40%);">+%{_libdir}/libosmo-hnbap.so</span><br><span style="color: hsl(120, 100%, 40%);">+%{_libdir}/pkgconfig/libosmo-hnbap.pc</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> %files -n libosmo-ranap3</span><br><span> %{_libdir}/libosmo-ranap.so.3*</span><br><span> </span><br><span>diff --git a/debian/control b/debian/control</span><br><span>index 236e853..e13834f 100644</span><br><span>--- a/debian/control</span><br><span>+++ b/debian/control</span><br><span>@@ -45,6 +45,28 @@</span><br><span>   Various manuals: user manual, VTY reference manual and/or</span><br><span>   protocol/interface manuals.</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+Package: libosmo-hnbap0</span><br><span style="color: hsl(120, 100%, 40%);">+Section: libs</span><br><span style="color: hsl(120, 100%, 40%);">+Architecture: any</span><br><span style="color: hsl(120, 100%, 40%);">+Multi-Arch: same</span><br><span style="color: hsl(120, 100%, 40%);">+Pre-Depends: ${misc:Pre-Depends}</span><br><span style="color: hsl(120, 100%, 40%);">+Depends: ${misc:Depends}, ${shlibs:Depends}</span><br><span style="color: hsl(120, 100%, 40%);">+Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Package: libosmo-hnbap-dbg</span><br><span style="color: hsl(120, 100%, 40%);">+Section: debug</span><br><span style="color: hsl(120, 100%, 40%);">+Architecture: any</span><br><span style="color: hsl(120, 100%, 40%);">+Multi-Arch: same</span><br><span style="color: hsl(120, 100%, 40%);">+Depends: libosmo-hnbap0 (= ${binary:Version}), ${misc:Depends}</span><br><span style="color: hsl(120, 100%, 40%);">+Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Package: libosmo-hnbap-dev</span><br><span style="color: hsl(120, 100%, 40%);">+Section: libdevel</span><br><span style="color: hsl(120, 100%, 40%);">+Architecture: any</span><br><span style="color: hsl(120, 100%, 40%);">+Multi-Arch: same</span><br><span style="color: hsl(120, 100%, 40%);">+Depends: libosmo-hnbap0 (= ${binary:Version}), ${misc:Depends}</span><br><span style="color: hsl(120, 100%, 40%);">+Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> Package: libosmo-ranap3</span><br><span> Section: libs</span><br><span> Architecture: any</span><br><span>diff --git a/debian/libosmo-hnbap-dev.install b/debian/libosmo-hnbap-dev.install</span><br><span>new file mode 100644</span><br><span>index 0000000..4191a57</span><br><span>--- /dev/null</span><br><span>+++ b/debian/libosmo-hnbap-dev.install</span><br><span>@@ -0,0 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+usr/include/osmocom/hnbap</span><br><span style="color: hsl(120, 100%, 40%);">+usr/lib/*/libosmo-hnbap.so</span><br><span style="color: hsl(120, 100%, 40%);">+usr/lib/*/pkgconfig/libosmo-hnbap.pc</span><br><span>diff --git a/debian/libosmo-hnbap0.install b/debian/libosmo-hnbap0.install</span><br><span>new file mode 100644</span><br><span>index 0000000..766f1f1</span><br><span>--- /dev/null</span><br><span>+++ b/debian/libosmo-hnbap0.install</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+usr/lib/*/libosmo-hnbap*.so.*</span><br><span>diff --git a/debian/rules b/debian/rules</span><br><span>index e1f6124..714ef8b 100755</span><br><span>--- a/debian/rules</span><br><span>+++ b/debian/rules</span><br><span>@@ -14,6 +14,7 @@</span><br><span> </span><br><span> # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg</span><br><span> override_dh_strip:</span><br><span style="color: hsl(120, 100%, 40%);">+       dh_strip -plibosmo-hnbap0 --dbg-package=libosmo-hnbap-dbg</span><br><span>    dh_strip -plibosmo-ranap3 --dbg-package=libosmo-ranap-dbg</span><br><span>    dh_strip -plibosmo-sabp0 --dbg-package=libosmo-sabp-dbg</span><br><span>      dh_strip -posmo-hnbgw --dbg-package=osmo-hnbgw-dbg</span><br><span>diff --git a/include/osmocom/hnbap/Makefile.am b/include/osmocom/hnbap/Makefile.am</span><br><span>index cd9b720..871549e 100644</span><br><span>--- a/include/osmocom/hnbap/Makefile.am</span><br><span>+++ b/include/osmocom/hnbap/Makefile.am</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-noinst_HEADERS = \</span><br><span style="color: hsl(120, 100%, 40%);">+hnbap_HEADERS = \</span><br><span>   hnbap_common.h hnbap_ies_defs.h \</span><br><span>    AccessResult.h \</span><br><span>     Access-stratum-release-indicator.h \</span><br><span>@@ -116,5 +116,7 @@</span><br><span>   U-RNTIQueryResponse.h \</span><br><span>      UTRANCellID.h</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+hnbapdir = $(includedir)/osmocom/hnbap</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DISTCLEANFILES = \</span><br><span>    hnbap_ies_defs.h</span><br><span>diff --git a/libosmo-hnbap.pc.in b/libosmo-hnbap.pc.in</span><br><span>new file mode 100644</span><br><span>index 0000000..db05756</span><br><span>--- /dev/null</span><br><span>+++ b/libosmo-hnbap.pc.in</span><br><span>@@ -0,0 +1,10 @@</span><br><span style="color: hsl(120, 100%, 40%);">+prefix=@prefix@</span><br><span style="color: hsl(120, 100%, 40%);">+exec_prefix=@exec_prefix@</span><br><span style="color: hsl(120, 100%, 40%);">+libdir=@libdir@</span><br><span style="color: hsl(120, 100%, 40%);">+includedir=@includedir@</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Name: Osmocom HNBAP protocol library</span><br><span style="color: hsl(120, 100%, 40%);">+Description: C Utility Library</span><br><span style="color: hsl(120, 100%, 40%);">+Version: @VERSION@</span><br><span style="color: hsl(120, 100%, 40%);">+Libs: -L${libdir} -losmo-hnbap</span><br><span style="color: hsl(120, 100%, 40%);">+Cflags: -I${includedir}/</span><br><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index 524f7b2..83a1cdc 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -61,9 +61,14 @@</span><br><span> </span><br><span> # build the shared RANAP + SABP library</span><br><span> #</span><br><span style="color: hsl(120, 100%, 40%);">+HNBAP_LIBVERSION=0:0:0</span><br><span> RANAP_LIBVERSION=4:0:1</span><br><span> SABP_LIBVERSION=0:0:0</span><br><span style="color: hsl(0, 100%, 40%);">-lib_LTLIBRARIES = libosmo-ranap.la libosmo-sabp.la</span><br><span style="color: hsl(120, 100%, 40%);">+lib_LTLIBRARIES = libosmo-hnbap.la libosmo-ranap.la libosmo-sabp.la</span><br><span style="color: hsl(120, 100%, 40%);">+libosmo_hnbap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HNBAP_LIBVERSION)</span><br><span style="color: hsl(120, 100%, 40%);">+libosmo_hnbap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+                          $(ASN1C_LIBS) hnbap/libosmo-asn1-hnbap.la</span><br><span style="color: hsl(120, 100%, 40%);">+libosmo_hnbap_la_SOURCES = hnbap_common.c hnbap_encoder.c hnbap_decoder.c</span><br><span> libosmo_ranap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RANAP_LIBVERSION)</span><br><span> libosmo_ranap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \</span><br><span>                       $(ASN1C_LIBS) ranap/libosmo-asn1-ranap.la</span><br><span>@@ -80,8 +85,7 @@</span><br><span> #</span><br><span> bin_PROGRAMS = osmo-hnbgw</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-osmo_hnbgw_SOURCES = hnbap_encoder.c hnbap_decoder.c hnbap_common.c \</span><br><span style="color: hsl(0, 100%, 40%);">-                   rua_encoder.c rua_decoder.c rua_common.c \</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_hnbgw_SOURCES = rua_encoder.c rua_decoder.c rua_common.c \</span><br><span>                  rua_msg_factory.c \</span><br><span>                  hnbgw.c hnbgw_hnbap.c hnbgw_rua.c hnbgw_ranap.c \</span><br><span>                    hnbgw_vty.c \</span><br><span>@@ -90,8 +94,8 @@</span><br><span> osmo_hnbgw_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOCTRL_LIBS) \</span><br><span>                $(ASN1C_LIBS) $(OSMOSIGTRAN_LIBS) \</span><br><span>                  $(OSMONETIF_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">-             hnbap/libosmo-asn1-hnbap.a rua/libosmo-asn1-rua.a \</span><br><span style="color: hsl(0, 100%, 40%);">-             libosmo-ranap.la</span><br><span style="color: hsl(120, 100%, 40%);">+              rua/libosmo-asn1-rua.a \</span><br><span style="color: hsl(120, 100%, 40%);">+              libosmo-ranap.la libosmo-hnbap.la</span><br><span> </span><br><span> </span><br><span> regen: regenerate-from-asn1-source</span><br><span>diff --git a/src/hnbap/Makefile.am b/src/hnbap/Makefile.am</span><br><span>index 8a2c56a..c4a8c29 100644</span><br><span>--- a/src/hnbap/Makefile.am</span><br><span>+++ b/src/hnbap/Makefile.am</span><br><span>@@ -236,9 +236,9 @@</span><br><span> </span><br><span> HNBAP_ASN1 = $(top_srcdir)/asn1/hnbap</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-noinst_LIBRARIES=libosmo-asn1-hnbap.a</span><br><span style="color: hsl(0, 100%, 40%);">-libosmo_asn1_hnbap_a_SOURCES=$(ASN_MODULE_SOURCES)</span><br><span style="color: hsl(0, 100%, 40%);">-libosmo_asn1_hnbap_a_LIBADD=$(ASN1C_LDADD)</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_LTLIBRARIES=libosmo-asn1-hnbap.la</span><br><span style="color: hsl(120, 100%, 40%);">+libosmo_asn1_hnbap_la_SOURCES=$(ASN_MODULE_SOURCES)</span><br><span style="color: hsl(120, 100%, 40%);">+libosmo_asn1_hnbap_la_LIBADD=$(ASN1C_LDADD)</span><br><span> </span><br><span> regen: regenerate-from-asn1-source</span><br><span> </span><br><span>diff --git a/src/ranap/Makefile.am b/src/ranap/Makefile.am</span><br><span>index 0fb3cdf..0bb36a0 100644</span><br><span>--- a/src/ranap/Makefile.am</span><br><span>+++ b/src/ranap/Makefile.am</span><br><span>@@ -1188,4 +1188,3 @@</span><br><span>       sed -i 's/Member/MemberN/' RANAP_RABDataVolumeReport.[ch]</span><br><span> #  change include style to `#include <dir/foo.h>'</span><br><span>     $(top_srcdir)/move-asn1-header-files.sh osmocom/ranap $(ASN_MODULE_INC)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am</span><br><span>index 72a3300..9f68145 100644</span><br><span>--- a/src/tests/Makefile.am</span><br><span>+++ b/src/tests/Makefile.am</span><br><span>@@ -18,10 +18,10 @@</span><br><span> test_helpers_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-ranap.la</span><br><span> </span><br><span> test_hnbap_SOURCES = $(top_srcdir)/src/hnbap_common.c $(top_builddir)/src/hnbap_decoder.c test-hnbap.c test_common.c</span><br><span style="color: hsl(0, 100%, 40%);">-test_hnbap_LDADD = $(COMMON_LIBS) $(top_builddir)/src/hnbap/libosmo-asn1-hnbap.a $(top_builddir)/src/libosmo-ranap.la</span><br><span style="color: hsl(120, 100%, 40%);">+test_hnbap_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-hnbap.la $(top_builddir)/src/libosmo-ranap.la</span><br><span> </span><br><span> hnb_test_SOURCES = $(HNBAP_FILES) $(RUA_FILES) hnb-test.c test_common.c hnb-test-ranap.c hnb-test-rua.c</span><br><span style="color: hsl(0, 100%, 40%);">-hnb_test_LDADD = $(COMMON_LIBS) $(top_builddir)/src/hnbap/libosmo-asn1-hnbap.a $(top_builddir)/src/rua/libosmo-asn1-rua.a $(top_builddir)/src/libosmo-ranap.la</span><br><span style="color: hsl(120, 100%, 40%);">+hnb_test_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-hnbap.la $(top_builddir)/src/rua/libosmo-asn1-rua.a $(top_builddir)/src/libosmo-ranap.la</span><br><span> </span><br><span> test_ranap_SOURCES = $(RANAP_FILES) test-ranap.c test_common.c</span><br><span> test_ranap_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-ranap.la</span><br><span>@@ -30,6 +30,9 @@</span><br><span> #dummy_cn_SOURCES = $(RANAP_FILES) test_common.c dummy_cn_sua.c</span><br><span> #dummy_cn_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-ranap.la</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+$(top_builddir)/src/libosmo-hnbap.la:</span><br><span style="color: hsl(120, 100%, 40%);">+        $(MAKE) -C $(top_builddir)/src libosmo-hnbap.la</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> $(top_builddir)/src/libosmo-ranap.la:</span><br><span>   $(MAKE) -C $(top_builddir)/src libosmo-ranap.la</span><br><span> </span><br><span>@@ -74,4 +77,3 @@</span><br><span> $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4</span><br><span>         $(AUTOTEST) -I '$(top_srcdir)/include' -I '$(srcdir)' -o $@.tmp $@.at</span><br><span>        mv $@.tmp $@</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-iuh/+/25880">change 25880</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-iuh/+/25880"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-iuh </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0d0862e9d59d3b206f3f7dfae4b39ae4032bb762 </div>
<div style="display:none"> Gerrit-Change-Number: 25880 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>