August 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: OSMUX_Emulation: Use Misc_Helpers.f_shutdown() everywhere

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29068 ) Change subject: OSMUX_Emulation: Use Misc_Helpers.f_shutdown() everywhere ...................................................................... OSMUX_Emulation: Use Misc_Helpers.f_shutdown() everywhere Change-Id: Id8f104a4123fcfbc96ab07f2e9343369946e3334 --- M library/OSMUX_Emulation.ttcn 1 file changed, 24 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/29068/1 diff --git a/library/OSMUX_Emulation.ttcn b/library/OSMUX_Emulation.ttcn index d31a562..5d9a95e 100644 --- a/library/OSMUX_Emulation.ttcn +++ b/library/OSMUX_Emulation.ttcn @@ -54,6 +54,7 @@ import from General_Types all; import from Osmocom_Types all; import from IPL4asp_Types all; +import from Misc_Helpers all; import from OSMUX_Types all; import from OSMUX_CodecPort all; import from OSMUX_CodecPort_CtrlFunct all; @@ -289,26 +290,26 @@ /* Check if there was some activity at either on the RX or on the * TX side, but complete silence would indicate some problem */ if (s.num_pkts_tx < 1 and s.num_pkts_rx < 1) { - setverdict(fail, "no Osmux packet activity detected (packets)"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "no Osmux packet activity detected (packets)"); } if (s.bytes_payload_tx < 1 and s.bytes_payload_rx < 1) { - setverdict(fail, "no Osmux packet activity detected (bytes)"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "no Osmux packet activity detected (bytes)"); } /* Check error counters */ if (s.num_pkts_rx_err_seq != 0) { - setverdict(fail, "Osmux packet sequence number errors occurred"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Osmux packet sequence number errors occurred"); } if (s.num_pkts_rx_err_disabled != 0) { - setverdict(fail, "Osmux packets received while RX was disabled"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Osmux packets received while RX was disabled"); } if (s.num_pkts_rx_err_payload != 0) { - setverdict(fail, "Osmux packets with mismatching payload received"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Osmux packets with mismatching payload received"); } } @@ -336,8 +337,9 @@ return RxHandleTable[i].vc_conn; } } - setverdict(fail, "No Component for CID ", cid); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("No Component for CID ", cid)); + return RxHandleTable[0].vc_conn; /* make compiler happy, not reached */ } private function f_rxhandle_cid_add(OsmuxRxHandle hdl) runs on OSMUX_Emulation_CT { @@ -349,8 +351,8 @@ return; } } - testcase.stop("No Space in RxHandleTable for ", hdl.cid); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("No Space in RxHandleTable for ", hdl.cid)); } private function f_txhandle_cid_add(OsmuxTxHandle hdl) runs on OSMUX_Emulation_CT { @@ -361,8 +363,8 @@ return; } } - testcase.stop("No Space in TxHandleList for ", hdl.cid); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("No Space in TxHandleList for ", hdl.cid)); } function f_osmux_gen_expected_rx_rtp_payload(INT4b amr_ft, octetstring tx_fixed_payload) return octetstring { @@ -459,8 +461,8 @@ res := OSMUX_CodecPort_CtrlFunct.f_IPL4_listen(OSMUX, g_local_host, g_local_port, {udp:={}}); if (not ispresent(res.connId)) { - setverdict(fail, "Could not listen on Osmux socket, check your configuration"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Could not listen on Osmux socket, check your configuration"); } g_osmux_conn_id := res.connId; tr_osmux_amr.connId := g_osmux_conn_id; @@ -474,8 +476,8 @@ g_local_host, g_local_port, g_osmux_conn_id, {udp:={}}); if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect to Osmux socket, check your configuration"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Could not connect to Osmux socket, check your configuration"); } g_tx_connected := true; CTRL.reply(OsmuxEM_connect:{g_remote_host, g_remote_port}); @@ -569,8 +571,8 @@ /* fail on any unexpected messages */ [] OSMUX.receive { - setverdict(fail, "Received unexpected type from Osmux"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Received unexpected msg type from Osmux"); } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id8f104a4123fcfbc96ab07f2e9343369946e3334 Gerrit-Change-Number: 29068 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: OSMUX_Emulation: Add special error case for port events

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29069 ) Change subject: OSMUX_Emulation: Add special error case for port events ...................................................................... OSMUX_Emulation: Add special error case for port events This way it's easier to quickly spot there was a problem with the socket connection. Change-Id: I962bf4837a9e359576c42a51a9919891186c7100 --- M library/OSMUX_Emulation.ttcn 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/29069/1 diff --git a/library/OSMUX_Emulation.ttcn b/library/OSMUX_Emulation.ttcn index 5d9a95e..6189266 100644 --- a/library/OSMUX_Emulation.ttcn +++ b/library/OSMUX_Emulation.ttcn @@ -422,7 +422,7 @@ var OsmuxRxHandle rx_hdl; var OsmuxTxHandle tx_hdl; var octetstring payload_truncated; - + var PortEvent port_event; timer T_transmit := int2float(g_cfg.tx_duration_ms)/1000.0; var Osmux_RecvFrom rx_osmux; var PDU_Osmux_AMR rx_amr; @@ -569,6 +569,11 @@ T_transmit.start; } + [] OSMUX.receive(PortEvent:?) -> value port_event { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Received unexpected port event from Osmux:", port_event)); + } + /* fail on any unexpected messages */ [] OSMUX.receive { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I962bf4837a9e359576c42a51a9919891186c7100 Gerrit-Change-Number: 29069 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in libosmo-pfcp[master]: fix warnings: 'uninitialized'

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/29054 ) Change subject: fix warnings: 'uninitialized' ...................................................................... fix warnings: 'uninitialized' Though these can never be used uninitialized, initialize to NULL to avoid compiler warnings like: pfcp_msg.c:188:66: warning: 'h_no_seid' may be used uninitialized Change-Id: Icb338b200fe3186ccd7fd3f502c1723f60947190 --- M src/libosmo-gtlv/gtlv_dec_enc.c M src/libosmo-pfcp/pfcp_msg.c 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved dexter: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/libosmo-gtlv/gtlv_dec_enc.c b/src/libosmo-gtlv/gtlv_dec_enc.c index 2e5509a..c3e45ea 100644 --- a/src/libosmo-gtlv/gtlv_dec_enc.c +++ b/src/libosmo-gtlv/gtlv_dec_enc.c @@ -71,7 +71,7 @@ { void *obj = MEMB(decoded_struct, obj_ofs); const struct osmo_gtlv_coding *iec; - unsigned int *multi_count_p; + unsigned int *multi_count_p = NULL; /* To check for presence of mandatory IEs, need to keep a flag stack of seen ie_coding entries. This array has * to have at least the nr of entries that the ie_coding array has. Let's allow up to this many ie_coding diff --git a/src/libosmo-pfcp/pfcp_msg.c b/src/libosmo-pfcp/pfcp_msg.c index 5f55575..098ffa2 100644 --- a/src/libosmo-pfcp/pfcp_msg.c +++ b/src/libosmo-pfcp/pfcp_msg.c @@ -158,8 +158,8 @@ static int enc_pfcp_header(struct msgb *msg, const struct osmo_pfcp_msg *m) { const struct osmo_pfcp_header_parsed *parsed = &m->h; - struct osmo_pfcp_header_seid *h_seid; - struct osmo_pfcp_header_no_seid *h_no_seid; + struct osmo_pfcp_header_seid *h_seid = NULL; + struct osmo_pfcp_header_no_seid *h_no_seid = NULL; struct osmo_pfcp_header_common *c; int rc; -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/29054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Icb338b200fe3186ccd7fd3f502c1723f60947190 Gerrit-Change-Number: 29054 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in libosmo-pfcp[master]: .gitignore fixes: generated sources, .spec file

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/29055 ) Change subject: .gitignore fixes: generated sources, .spec file ...................................................................... .gitignore fixes: generated sources, .spec file Change-Id: Id8f6c80f13a09a3dedd4577fd1460f2f72faa8f8 --- M .gitignore 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 2d26084..56bd8e6 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,10 @@ *.pc *~ +include/osmocom/pfcp/pfcp_ies_auto.h +src/libosmo-pfcp/gen__pfcp_ies_auto +src/libosmo-pfcp/pfcp_ies_auto.c + *.*~ *.sw? .libs @@ -51,6 +55,13 @@ #tests tests/testsuite.dir tests/*/*_test +tests/*/*/*_test +tests/libosmo-gtlv/test_gtlv_gen/gen__myproto_ies_auto +tests/libosmo-gtlv/test_gtlv_gen/myproto_ies_auto.c +tests/libosmo-gtlv/test_gtlv_gen/myproto_ies_auto.h +tests/libosmo-gtlv/test_tliv/gen__myproto_ies_auto +tests/libosmo-gtlv/test_tliv/myproto_ies_auto.c +tests/libosmo-gtlv/test_tliv/myproto_ies_auto.h tests/atconfig tests/atlocal @@ -71,4 +82,4 @@ doc/manuals/common doc/manuals/build -contrib/osmo-upf.spec +contrib/libosmo-pfcp.spec -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/29055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Id8f6c80f13a09a3dedd4577fd1460f2f72faa8f8 Gerrit-Change-Number: 29055 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in libosmo-pfcp[master]: debian: fix missing dep gtlv0 <- pfcp0

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/29052 ) Change subject: debian: fix missing dep gtlv0 <- pfcp0 ...................................................................... debian: fix missing dep gtlv0 <- pfcp0 Change-Id: I8af60305543b06b74859e83b840b171d29af1abd --- M debian/control 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/debian/control b/debian/control index ca7eaa6..c5d9f04 100644 --- a/debian/control +++ b/debian/control @@ -68,7 +68,8 @@ Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, + libosmo-gtlv0 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: PFCP protocol support Decoding, encoding and endpoint implementation of the Packet Forwarding Control Protocol @@ -79,7 +80,8 @@ Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libosmo-pfcp0 (= ${binary:Version}) + libosmo-pfcp0 (= ${binary:Version}), + libosmo-gtlv-dev (= ${binary:Version}) Description: Development files 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 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/29052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I8af60305543b06b74859e83b840b171d29af1abd Gerrit-Change-Number: 29052 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in libosmo-pfcp[master]: libosmo-gtlv.pc.in: tweak Description

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/29053 ) Change subject: libosmo-gtlv.pc.in: tweak Description ...................................................................... libosmo-gtlv.pc.in: tweak Description Change-Id: Idcdffe4528370b8580a30fbdde6645ec5d814021 --- M libosmo-gtlv.pc.in 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/libosmo-gtlv.pc.in b/libosmo-gtlv.pc.in index 69de862..63e3c73 100644 --- a/libosmo-gtlv.pc.in +++ b/libosmo-gtlv.pc.in @@ -4,7 +4,7 @@ includedir=@includedir@ Name: Osmocom Generic TLV Library -Description: C Utility Library +Description: C Utility Library to parse Tag-Length-Value based protocols Version: @VERSION@ Libs: -L${libdir} -losmo-gtlv Cflags: -I${includedir}/ -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/29053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Idcdffe4528370b8580a30fbdde6645ec5d814021 Gerrit-Change-Number: 29053 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in libosmo-pfcp[master]: debian/control: fix confusion in description

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/29051 ) Change subject: debian/control: fix confusion in description ...................................................................... debian/control: fix confusion in description Change-Id: I380b1dd626b3e6a35f17ae09a6758bef59f51c84 --- M debian/control 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/debian/control b/debian/control index d1f8b43..ca7eaa6 100644 --- a/debian/control +++ b/debian/control @@ -46,7 +46,7 @@ Section: libdevel Depends: ${misc:Depends}, libosmo-gtlv0 (= ${binary:Version}) -Description: Development headers for libosmo-gtlv +Description: Development files 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. @@ -80,7 +80,7 @@ Section: libdevel Depends: ${misc:Depends}, libosmo-pfcp0 (= ${binary:Version}) -Description: Development headers for libosmo-pfcp +Description: Development files 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. -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/29051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I380b1dd626b3e6a35f17ae09a6758bef59f51c84 Gerrit-Change-Number: 29051 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in libosmo-pfcp[master]: configure.ac: drop dependencies on vty and ctrl

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/29048 ) Change subject: configure.ac: drop dependencies on vty and ctrl ...................................................................... configure.ac: drop dependencies on vty and ctrl Change-Id: Idea223e9b039241dd35c735922b8794573730fc3 --- M configure.ac 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 77cb672..f146c20 100644 --- a/configure.ac +++ b/configure.ac @@ -41,8 +41,6 @@ AC_SUBST(LIBRARY_DL) PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) dnl checks for header files AC_HEADER_STDC -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/29048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Idea223e9b039241dd35c735922b8794573730fc3 Gerrit-Change-Number: 29048 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in libosmo-pfcp[master]: debian: add missing *-dev.install files

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/29050 ) Change subject: debian: add missing *-dev.install files ...................................................................... debian: add missing *-dev.install files Change-Id: I6b03624f3d93ad6b2551fb3ff673e7c7cb246f4c --- A debian/libosmo-gtlv-dev.install A debian/libosmo-pfcp-dev.install 2 files changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/debian/libosmo-gtlv-dev.install b/debian/libosmo-gtlv-dev.install new file mode 100644 index 0000000..ba5264b --- /dev/null +++ b/debian/libosmo-gtlv-dev.install @@ -0,0 +1,5 @@ +usr/include/osmocom/gtlv +usr/lib/*/libosmo-gtlv*.a +usr/lib/*/libosmo-gtlv*.so +usr/lib/*/libosmo-gtlv*.la +usr/lib/*/pkgconfig/libosmo-gtlv.pc diff --git a/debian/libosmo-pfcp-dev.install b/debian/libosmo-pfcp-dev.install new file mode 100644 index 0000000..1b40eab --- /dev/null +++ b/debian/libosmo-pfcp-dev.install @@ -0,0 +1,5 @@ +usr/include/osmocom/pfcp +usr/lib/*/libosmo-pfcp*.a +usr/lib/*/libosmo-pfcp*.so +usr/lib/*/libosmo-pfcp*.la +usr/lib/*/pkgconfig/libosmo-pfcp.pc -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/29050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I6b03624f3d93ad6b2551fb3ff673e7c7cb246f4c Gerrit-Change-Number: 29050 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in libosmo-pfcp[master]: RPM: fix .spec file

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/29049 ) Change subject: RPM: fix .spec file ...................................................................... RPM: fix .spec file Change-Id: Ie2fa0770b94af8637483434068b7c0df4b4272c6 --- M configure.ac M contrib/libosmo-pfcp.spec.in 2 files changed, 77 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index f146c20..446f0b1 100644 --- a/configure.ac +++ b/configure.ac @@ -86,6 +86,7 @@ AC_CONFIG_FILES([ libosmo-gtlv.pc libosmo-pfcp.pc + contrib/libosmo-pfcp.spec include/Makefile include/osmocom/Makefile include/osmocom/gtlv/Makefile diff --git a/contrib/libosmo-pfcp.spec.in b/contrib/libosmo-pfcp.spec.in index d3cf821..9e2c06a 100644 --- a/contrib/libosmo-pfcp.spec.in +++ b/contrib/libosmo-pfcp.spec.in @@ -12,12 +12,58 @@ BuildRequires: lksctp-tools-devel BuildRequires: pkgconfig >= 0.20 BuildRequires: pkgconfig(libosmocore) >= 1.6.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.6.0 -BuildRequires: pkgconfig(libosmovty) >= 1.6.0 BuildRequires: pkgconfig(talloc) %description -libosmo-pfcp: PFCP protocol encoding and decoding, and generic PFCP endpoint implementation +Description: Osmocom PFCP protocol implementation (metapackage) + +Install Osmocom PFCP and generic TLV protocol libraries. +libosmo-gtlv and libosmo-pfcp + + +%package -n libosmo-gtlv0 +Summary: Generic TLV and TLIV protocol support +License: GPL-2.0-or-later AND AGPL-3.0-or-later +Group: System/Libraries + +%description -n libosmo-gtlv0 +Decoding, encoding and logging of protocols using a Tag-Length-Value and/or +Tag-Length-Instance-Value structure. + + +%package -n libosmo-gtlv-devel +Summary: Development files for libosmo-pfcp +License: GPL-2.0-or-later +Group: Development/Libraries/C and C++ +Requires: libosmo-gtlv0 = %{version} + +%description -n libosmo-gtlv-devel +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 -n libosmo-pfcp0 +Summary: PFCP protocol support +License: GPL-2.0-or-later AND AGPL-3.0-or-later +Group: System/Libraries + +%description -n libosmo-pfcp0 +PFCP protocol support: Decoding, encoding and endpoint implementation of the +Packet Forwarding Control Protocol (3GPP TS 29.244). + + +%package -n libosmo-pfcp-devel +Summary: Development files for libosmo-pfcp +License: GPL-2.0-or-later +Group: Development/Libraries/C and C++ +Requires: libosmo-pfcp0 = %{version} + +%description -n libosmo-pfcp-devel +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. + %prep %setup -q @@ -30,13 +76,36 @@ %install %make_install +find %{buildroot} -type f -name "*.la" -delete -print %check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) -%files -%license COPYING -%doc AUTHORS README.md -%{_bindir}/libosmo-pfcp +%post -n libosmo-gtlv0 -p /sbin/ldconfig +%postun -n libosmo-gtlv0 -p /sbin/ldconfig +%post -n libosmo-pfcp0 -p /sbin/ldconfig +%postun -n libosmo-pfcp0 -p /sbin/ldconfig + +%files -n libosmo-gtlv0 +%{_libdir}/libosmo-gltv.so.0* + +%files -n libosmo-gtlv-devel +%dir %{_includedir}/%{name} +%dir %{_includedir}/%{name}/osmocom +%{_includedir}/%{name}/osmocom/gtlv +%{_libdir}/libosmo-gtlv.so +%{_libdir}/libosmo-gtlv.a +%{_libdir}/pkgconfig/libosmo-gtlv.pc + +%files -n libosmo-pfcp0 +%{_libdir}/libosmo-pfcp.so.0* + +%files -n libosmo-pfcp-devel +%dir %{_includedir}/%{name} +%dir %{_includedir}/%{name}/osmocom +%{_includedir}/%{name}/osmocom/pfcp +%{_libdir}/libosmo-pfcp.so +%{_libdir}/libosmo-pfcp.a +%{_libdir}/pkgconfig/libosmo-pfcp.pc %changelog -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/29049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Ie2fa0770b94af8637483434068b7c0df4b4272c6 Gerrit-Change-Number: 29049 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2022