<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-iuh/+/25887">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Provide libosmo-rua as a public shared library<br><br>It is needed by the new osmo-hnodeb project.<br><br>Change-Id: I8b800baacbfe3a3c424c51b418b5ac2e2848b3ba<br>---<br>M Makefile.am<br>M configure.ac<br>M contrib/osmo-iuh.spec.in<br>M debian/control<br>A debian/libosmo-rua-dev.install<br>A debian/libosmo-rua0.install<br>M debian/rules<br>M include/osmocom/rua/Makefile.am<br>A libosmo-rua.pc.in<br>M src/Makefile.am<br>M src/rua/Makefile.am<br>M src/tests/Makefile.am<br>12 files changed, 81 insertions(+), 16 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/87/25887/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 1dc00d6..f40cbd1 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-hnbap.pc libosmo-ranap.pc libosmo-sabp.pc</span><br><span style="color: hsl(120, 100%, 40%);">+pkgconfig_DATA = libosmo-hnbap.pc libosmo-ranap.pc libosmo-rua.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 93c5bb1..5490348 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -152,6 +152,7 @@</span><br><span> AC_OUTPUT(</span><br><span> libosmo-hnbap.pc</span><br><span> libosmo-ranap.pc</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-rua.pc</span><br><span> libosmo-sabp.pc</span><br><span> src/Makefile</span><br><span> src/hnbap/Makefile</span><br><span>diff --git a/contrib/osmo-iuh.spec.in b/contrib/osmo-iuh.spec.in</span><br><span>index 592b168..2ef38a3 100644</span><br><span>--- a/contrib/osmo-iuh.spec.in</span><br><span>+++ b/contrib/osmo-iuh.spec.in</span><br><span>@@ -75,6 +75,20 @@</span><br><span> This subpackage contains libraries and header files for developing</span><br><span> applications that want to make use of libosmoranap.</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+%package -n libosmo-rua0</span><br><span style="color: hsl(120, 100%, 40%);">+Summary: Shared Library part of libosmo-rua</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-rua0</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-rua-devel</span><br><span style="color: hsl(120, 100%, 40%);">+Summary: Development files for Osmocom RUA 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-rua0 = %{version}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+%description -n libosmo-rua-devel</span><br><span style="color: hsl(120, 100%, 40%);">+Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)</span><br><span> </span><br><span> %package -n libosmo-sabp0</span><br><span> Summary: Shared Library part of libosmo-sabp</span><br><span>@@ -152,6 +166,14 @@</span><br><span> %{_libdir}/libosmo-ranap.so</span><br><span> %{_libdir}/pkgconfig/libosmo-ranap.pc</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+%files -n libosmo-rua0</span><br><span style="color: hsl(120, 100%, 40%);">+%{_libdir}/libosmo-rua.so.0*</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+%files -n libosmo-rua-devel</span><br><span style="color: hsl(120, 100%, 40%);">+%{_includedir}/*</span><br><span style="color: hsl(120, 100%, 40%);">+%{_libdir}/libosmo-rua.so</span><br><span style="color: hsl(120, 100%, 40%);">+%{_libdir}/pkgconfig/libosmo-rua.pc</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> %files -n libosmo-sabp0</span><br><span> %{_libdir}/libosmo-sabp.so.0*</span><br><span> </span><br><span>diff --git a/debian/control b/debian/control</span><br><span>index e13834f..f89869a 100644</span><br><span>--- a/debian/control</span><br><span>+++ b/debian/control</span><br><span>@@ -89,6 +89,28 @@</span><br><span> Depends: libosmo-ranap3 (= ${binary:Version}), ${misc:Depends}</span><br><span> Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+Package: libosmo-rua0</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-rua-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-rua0 (= ${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-rua-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-rua0 (= ${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-sabp0</span><br><span> Section: libs</span><br><span> Architecture: any</span><br><span>diff --git a/debian/libosmo-rua-dev.install b/debian/libosmo-rua-dev.install</span><br><span>new file mode 100644</span><br><span>index 0000000..b615076</span><br><span>--- /dev/null</span><br><span>+++ b/debian/libosmo-rua-dev.install</span><br><span>@@ -0,0 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+usr/include/osmocom/rua</span><br><span style="color: hsl(120, 100%, 40%);">+usr/lib/*/libosmo-rua.so</span><br><span style="color: hsl(120, 100%, 40%);">+usr/lib/*/pkgconfig/libosmo-rua.pc</span><br><span>diff --git a/debian/libosmo-rua0.install b/debian/libosmo-rua0.install</span><br><span>new file mode 100644</span><br><span>index 0000000..ac07bed</span><br><span>--- /dev/null</span><br><span>+++ b/debian/libosmo-rua0.install</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+usr/lib/*/libosmo-rua*.so.*</span><br><span>diff --git a/debian/rules b/debian/rules</span><br><span>index 714ef8b..b85b0d2 100755</span><br><span>--- a/debian/rules</span><br><span>+++ b/debian/rules</span><br><span>@@ -16,6 +16,7 @@</span><br><span> override_dh_strip:</span><br><span> dh_strip -plibosmo-hnbap0 --dbg-package=libosmo-hnbap-dbg</span><br><span> dh_strip -plibosmo-ranap3 --dbg-package=libosmo-ranap-dbg</span><br><span style="color: hsl(120, 100%, 40%);">+ dh_strip -plibosmo-rua0 --dbg-package=libosmo-rua-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> </span><br><span>diff --git a/include/osmocom/rua/Makefile.am b/include/osmocom/rua/Makefile.am</span><br><span>index 307f123..37b9384 100644</span><br><span>--- a/include/osmocom/rua/Makefile.am</span><br><span>+++ b/include/osmocom/rua/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%);">+rua_HEADERS = \</span><br><span> rua_common.h rua_ies_defs.h rua_msg_factory.h \</span><br><span> RUA_Ansi-41-IDNNS.h \</span><br><span> RUA_Cause.h \</span><br><span>@@ -36,5 +36,7 @@</span><br><span> RUA_TypeOfError.h \</span><br><span> RUA_UnsuccessfulOutcome.h</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ruadir = $(includedir)/osmocom/rua</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DISTCLEANFILES = \</span><br><span> rua_ies_defs.h</span><br><span>diff --git a/libosmo-rua.pc.in b/libosmo-rua.pc.in</span><br><span>new file mode 100644</span><br><span>index 0000000..b9bd1d4</span><br><span>--- /dev/null</span><br><span>+++ b/libosmo-rua.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 RUA 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-rua</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 3414a01..c1508ad 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -63,8 +63,9 @@</span><br><span> #</span><br><span> HNBAP_LIBVERSION=0:0:0</span><br><span> RANAP_LIBVERSION=4:0:1</span><br><span style="color: hsl(120, 100%, 40%);">+RUA_LIBVERSION=0:0:0</span><br><span> SABP_LIBVERSION=0:0:0</span><br><span style="color: hsl(0, 100%, 40%);">-lib_LTLIBRARIES = libosmo-hnbap.la libosmo-ranap.la libosmo-sabp.la</span><br><span style="color: hsl(120, 100%, 40%);">+lib_LTLIBRARIES = libosmo-hnbap.la libosmo-ranap.la libosmo-rua.la libosmo-sabp.la</span><br><span> libosmo_hnbap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HNBAP_LIBVERSION)</span><br><span> libosmo_hnbap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \</span><br><span> $(ASN1C_LIBS) hnbap/libosmo-asn1-hnbap.la</span><br><span>@@ -76,6 +77,11 @@</span><br><span> libosmo_ranap_la_SOURCES = ranap_common.c ranap_encoder.c ranap_decoder.c ranap_msg_factory.c iu_helpers.c \</span><br><span> ranap_common_cn.c iu_client.c iu_client_vty.c</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+libosmo_rua_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HNBAP_LIBVERSION)</span><br><span style="color: hsl(120, 100%, 40%);">+libosmo_rua_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(ASN1C_LIBS) rua/libosmo-asn1-rua.la</span><br><span style="color: hsl(120, 100%, 40%);">+libosmo_rua_la_SOURCES = rua_common.c rua_encoder.c rua_decoder.c rua_msg_factory.c</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> libosmo_sabp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(SABP_LIBVERSION)</span><br><span> libosmo_sabp_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \</span><br><span> $(ASN1C_LIBS) sabp/libosmo-asn1-sabp.la</span><br><span>@@ -86,17 +92,14 @@</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 = rua_encoder.c rua_decoder.c rua_common.c \</span><br><span style="color: hsl(0, 100%, 40%);">- rua_msg_factory.c \</span><br><span style="color: hsl(0, 100%, 40%);">- hnbgw.c hnbgw_hnbap.c hnbgw_rua.c hnbgw_ranap.c \</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_hnbgw_SOURCES = hnbgw.c hnbgw_hnbap.c hnbgw_rua.c hnbgw_ranap.c \</span><br><span> hnbgw_vty.c \</span><br><span> context_map.c hnbgw_cn.c</span><br><span> </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%);">- rua/libosmo-asn1-rua.a \</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-hnbap.la libosmo-ranap.la</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo-hnbap.la libosmo-rua.la libosmo-ranap.la</span><br><span> </span><br><span> </span><br><span> regen: regenerate-from-asn1-source</span><br><span>diff --git a/src/rua/Makefile.am b/src/rua/Makefile.am</span><br><span>index d8fb042..7e1d18e 100644</span><br><span>--- a/src/rua/Makefile.am</span><br><span>+++ b/src/rua/Makefile.am</span><br><span>@@ -74,9 +74,9 @@</span><br><span> </span><br><span> AM_CFLAGS = -I$(top_srcdir)/include $(ASN1C_CFLAGS) $(OSMOCORE_CFLAGS)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-noinst_LIBRARIES=libosmo-asn1-rua.a</span><br><span style="color: hsl(0, 100%, 40%);">-libosmo_asn1_rua_a_SOURCES=$(ASN_MODULE_SOURCES)</span><br><span style="color: hsl(0, 100%, 40%);">-libosmo_asn1_rua_a_LIBADD=$(ASN1C_LDADD)</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_LTLIBRARIES=libosmo-asn1-rua.la</span><br><span style="color: hsl(120, 100%, 40%);">+libosmo_asn1_rua_la_SOURCES=$(ASN_MODULE_SOURCES)</span><br><span style="color: hsl(120, 100%, 40%);">+libosmo_asn1_rua_la_LIBADD=$(ASN1C_LDADD)</span><br><span> </span><br><span> regen: regenerate-from-asn1-source</span><br><span> </span><br><span>@@ -86,4 +86,3 @@</span><br><span> @rm ANY.* BOOLEAN.* INTEGER.* NativeEnumerated.* NativeInteger.* OBJECT_IDENTIFIER.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.*</span><br><span> # change include style to `#include <dir/foo.h>'</span><br><span> $(top_srcdir)/move-asn1-header-files.sh osmocom/rua $(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 dfc8fe6..2063524 100644</span><br><span>--- a/src/tests/Makefile.am</span><br><span>+++ b/src/tests/Makefile.am</span><br><span>@@ -11,16 +11,14 @@</span><br><span> </span><br><span> noinst_HEADERS = test_common.h hnb-test.h hnb-test-layers.h</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RUA_FILES = $(top_srcdir)/src/rua_common.c $(top_builddir)/src/rua_decoder.c $(top_builddir)/src/rua_encoder.c $(top_srcdir)/src/rua_msg_factory.c</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> test_helpers_SOURCES = test-helpers.c test_common.c</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> test_hnbap_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-hnbap.la $(top_builddir)/src/libosmo-ranap.la</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-hnb_test_SOURCES = $(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/libosmo-hnbap.la $(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_SOURCES = hnb-test.c test_common.c hnb-test-ranap.c hnb-test-rua.c</span><br><span style="color: hsl(120, 100%, 40%);">+hnb_test_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-hnbap.la $(top_builddir)/src/libosmo-rua.la $(top_builddir)/src/libosmo-ranap.la</span><br><span> </span><br><span> test_ranap_SOURCES = test-ranap.c test_common.c</span><br><span> test_ranap_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-ranap.la</span><br><span>@@ -32,6 +30,9 @@</span><br><span> $(top_builddir)/src/libosmo-hnbap.la:</span><br><span> $(MAKE) -C $(top_builddir)/src libosmo-hnbap.la</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+$(top_builddir)/src/libosmo-rua.la:</span><br><span style="color: hsl(120, 100%, 40%);">+ $(MAKE) -C $(top_builddir)/src libosmo-rua.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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-iuh/+/25887">change 25887</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/+/25887"/><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: I8b800baacbfe3a3c424c51b418b5ac2e2848b3ba </div>
<div style="display:none"> Gerrit-Change-Number: 25887 </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>