March 2023 - gerrit-log - lists.osmocom.org

[S] Change in libosmocore[master]: tests/Makefile.am: Drop duplicated libosmogb.la in LDADD
by fixeria 14 Mar '23

14 Mar '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31907 ) Change subject: tests/Makefile.am: Drop duplicated libosmogb.la in LDADD ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I20e815ba5dc473c644e1098f2347b183f215a51a Gerrit-Change-Number: 31907 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Mar 2023 13:36:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: tests/Makefile.am: Move system libs at the end of list
by pespin 14 Mar '23

14 Mar '23

Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31906 ) Change subject: tests/Makefile.am: Move system libs at the end of list ...................................................................... Patch Set 1: (1 comment) File tests/Makefile.am: https://gerrit.osmocom.org/c/libosmocore/+/31906/comment/1dd4dbac_2b66fe5e PS1, Line 235: LDADD > BTW, `$(LDADD)` contains both local and system libs, so it should also be moved. See next patch ;) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iad6b9e39e3587849ccfd475899cbd610bf7145cd Gerrit-Change-Number: 31906 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Mar 2023 13:36:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: tests/Makefile.am: Move system libs at the end of list
by fixeria 14 Mar '23

14 Mar '23

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31906 ) Change subject: tests/Makefile.am: Move system libs at the end of list ...................................................................... Patch Set 1: (1 comment) File tests/Makefile.am: https://gerrit.osmocom.org/c/libosmocore/+/31906/comment/e96f14c4_c96948e1 PS1, Line 235: LDADD BTW, `$(LDADD)` contains both local and system libs, so it should also be moved. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iad6b9e39e3587849ccfd475899cbd610bf7145cd Gerrit-Change-Number: 31906 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Mar 2023 13:35:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: logging.c: Sanitize calls to osmo_fd_unregister()
by pespin 14 Mar '23

14 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/31909 ) Change subject: logging.c: Sanitize calls to osmo_fd_unregister() ...................................................................... logging.c: Sanitize calls to osmo_fd_unregister() It makes no sense to call osmo_fd_unregister() on a negative fd. Let's also make sure we set fd to negative value after unregistering + closing, even if the struct is going to be freed afterwards. Change-Id: I0790a63e603028c11cc475d483c6528e4d9aa9ab --- M src/core/logging.c 1 file changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/09/31909/1 diff --git a/src/core/logging.c b/src/core/logging.c index bcfe318..3095f0d 100644 --- a/src/core/logging.c +++ b/src/core/logging.c @@ -1161,6 +1161,7 @@ if (target->type == LOG_TGT_TYPE_FILE) { osmo_fd_unregister(&wq->bfd); close(wq->bfd.fd); + wq->bfd.fd = -1; } /* release the queue itself */ @@ -1327,8 +1328,8 @@ } wq = target->tgt_file.wqueue; if (wq) { - osmo_fd_unregister(&wq->bfd); if (wq->bfd.fd >= 0) { + osmo_fd_unregister(&wq->bfd); if (target->type == LOG_TGT_TYPE_FILE) close(wq->bfd.fd); wq->bfd.fd = -1; @@ -1375,8 +1376,8 @@ return -errno; } else { wq = target->tgt_file.wqueue; - osmo_fd_unregister(&wq->bfd); if (wq->bfd.fd >= 0) { + osmo_fd_unregister(&wq->bfd); close(wq->bfd.fd); wq->bfd.fd = -1; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0790a63e603028c11cc475d483c6528e4d9aa9ab Gerrit-Change-Number: 31909 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmocore[master]: tests/Makefile.am: Move LDADD to right position
by pespin 14 Mar '23

14 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/31908 ) Change subject: tests/Makefile.am: Move LDADD to right position ...................................................................... tests/Makefile.am: Move LDADD to right position LDADD var contains both local and system libraries. Use it at the right place (after list of local libs, before list of system libs). Change-Id: Ifb3686f78432ac877c596004646506c540b23c53 --- M tests/Makefile.am 1 file changed, 89 insertions(+), 67 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/08/31908/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 2ec173b..49ad6a7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -93,41 +93,42 @@ base64_base64_test_SOURCES = base64/base64_test.c utils_utils_test_SOURCES = utils/utils_test.c -utils_utils_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +utils_utils_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) stats_stats_test_SOURCES = stats/stats_test.c -stats_stats_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +stats_stats_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) stats_stats_test_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/core stats_stats_vty_test_SOURCES = stats/stats_vty_test.c -stats_stats_vty_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la +stats_stats_vty_test_LDADD = $(top_builddir)/src/vty/libosmovty.la $(LDADD) a5_a5_test_SOURCES = a5/a5_test.c -a5_a5_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libgsmint.la +a5_a5_test_LDADD = $(top_builddir)/src/gsm/libgsmint.la $(LDADD) kasumi_kasumi_test_SOURCES = kasumi/kasumi_test.c -kasumi_kasumi_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libgsmint.la +kasumi_kasumi_test_LDADD = $(top_builddir)/src/gsm/libgsmint.la $(LDADD) comp128_comp128_test_SOURCES = comp128/comp128_test.c -comp128_comp128_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +comp128_comp128_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) auth_milenage_test_SOURCES = auth/milenage_test.c -auth_milenage_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +auth_milenage_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) auth_xor2g_test_SOURCES = auth/xor2g_test.c -auth_xor2g_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +auth_xor2g_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) abis_abis_test_SOURCES = abis/abis_test.c -abis_abis_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +abis_abis_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) ctrl_ctrl_test_SOURCES = ctrl/ctrl_test.c -ctrl_ctrl_test_LDADD = $(LDADD) \ +ctrl_ctrl_test_LDADD = \ $(top_builddir)/src/ctrl/libosmoctrl.la \ $(top_builddir)/src/gsm/libosmogsm.la \ - $(top_builddir)/src/vty/libosmovty.la + $(top_builddir)/src/vty/libosmovty.la \ + $(LDADD) gea_gea_test_SOURCES = gea/gea_test.c -gea_gea_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +gea_gea_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) bits_bitrev_test_SOURCES = bits/bitrev_test.c @@ -138,110 +139,116 @@ bits_bitfield_test_SOURCES = bits/bitfield_test.c conv_conv_test_SOURCES = conv/conv_test.c conv/conv.c -conv_conv_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libgsmint.la +conv_conv_test_LDADD = $(top_builddir)/src/gsm/libgsmint.la $(LDADD) gsm0502_gsm0502_test_SOURCES = gsm0502/gsm0502_test.c -gsm0502_gsm0502_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +gsm0502_gsm0502_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) dtx_dtx_gsm0503_test_SOURCES = dtx/dtx_gsm0503_test.c -dtx_dtx_gsm0503_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la \ - $(top_builddir)/src/coding/libosmocoding.la +dtx_dtx_gsm0503_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la \ + $(top_builddir)/src/coding/libosmocoding.la \ + $(LDADD) conv_conv_gsm0503_test_SOURCES = conv/conv_gsm0503_test.c conv/conv.c conv/gsm0503_test_vectors.c -conv_conv_gsm0503_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libgsmint.la +conv_conv_gsm0503_test_LDADD = $(top_builddir)/src/gsm/libgsmint.la $(LDADD) conv_conv_gsm0503_test_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/conv gsm0808_gsm0808_test_SOURCES = gsm0808/gsm0808_test.c -gsm0808_gsm0808_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +gsm0808_gsm0808_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) gsm29205_gsm29205_test_SOURCES = gsm29205/gsm29205_test.c -gsm29205_gsm29205_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +gsm29205_gsm29205_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) gsm0408_gsm0408_test_SOURCES = gsm0408/gsm0408_test.c -gsm0408_gsm0408_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +gsm0408_gsm0408_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) gsm48_rest_octets_test_SOURCES = gsm48/rest_octets_test.c -gsm48_rest_octets_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +gsm48_rest_octets_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) gprs_gprs_test_SOURCES = gprs/gprs_test.c -gprs_gprs_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +gprs_gprs_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) lapd_lapd_test_SOURCES = lapd/lapd_test.c -lapd_lapd_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la $(top_builddir)/src/isdn/libosmoisdn.la +lapd_lapd_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la \ + $(top_builddir)/src/isdn/libosmoisdn.la \ + $(LDADD) msgb_msgb_test_SOURCES = msgb/msgb_test.c msgfile_msgfile_test_SOURCES = msgfile/msgfile_test.c smscb_smscb_test_SOURCES = smscb/smscb_test.c -smscb_smscb_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +smscb_smscb_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) smscb_gsm0341_test_SOURCES = smscb/gsm0341_test.c -smscb_gsm0341_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +smscb_gsm0341_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) smscb_cbsp_test_SOURCES = smscb/cbsp_test.c -smscb_cbsp_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +smscb_cbsp_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) sms_sms_test_SOURCES = sms/sms_test.c -sms_sms_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +sms_sms_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) timer_timer_test_SOURCES = timer/timer_test.c timer_clk_override_test_SOURCES = timer/clk_override_test.c ussd_ussd_test_SOURCES = ussd/ussd_test.c -ussd_ussd_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +ussd_ussd_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) gb_bssgp_fc_test_SOURCES = gb/bssgp_fc_test.c -gb_bssgp_fc_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la \ +gb_bssgp_fc_test_LDADD = $(top_builddir)/src/gb/libosmogb.la \ $(top_builddir)/src/vty/libosmovty.la \ - $(top_builddir)/src/gsm/libosmogsm.la + $(top_builddir)/src/gsm/libosmogsm.la \ + $(LDADD) gb_gprs_bssgp_test_SOURCES = gb/gprs_bssgp_test.c -gb_gprs_bssgp_test_LDADD = $(LDADD) \ - $(top_builddir)/src/vty/libosmovty.la \ +gb_gprs_bssgp_test_LDADD = $(top_builddir)/src/vty/libosmovty.la \ $(top_builddir)/src/gsm/libosmogsm.la \ $(top_builddir)/src/gb/libosmogb.la \ + $(LDADD) \ $(LIBRARY_DLSYM) gb_gprs_bssgp_rim_test_SOURCES = gb/gprs_bssgp_rim_test.c -gb_gprs_bssgp_rim_test_LDADD = $(LDADD) \ - $(top_builddir)/src/gb/libosmogb.la \ +gb_gprs_bssgp_rim_test_LDADD = $(top_builddir)/src/gb/libosmogb.la \ + $(LDADD) \ $(LIBRARY_DLSYM) gb_gprs_ns_test_SOURCES = gb/gprs_ns_test.c -gb_gprs_ns_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la \ +gb_gprs_ns_test_LDADD = $(top_builddir)/src/gb/libosmogb.la \ $(top_builddir)/src/vty/libosmovty.la \ $(top_builddir)/src/gsm/libosmogsm.la \ + $(LDADD) \ $(LIBRARY_DLSYM) gb_gprs_ns2_test_SOURCES = gb/gprs_ns2_test.c -gb_gprs_ns2_test_LDADD = $(LDADD) \ - $(top_builddir)/src/vty/libosmovty.la \ +gb_gprs_ns2_test_LDADD = $(top_builddir)/src/vty/libosmovty.la \ $(top_builddir)/src/gsm/libosmogsm.la \ $(top_builddir)/src/core/libosmocore.la \ $(top_builddir)/src/gb/libosmogb-test.la \ + $(LDADD) \ $(LIBRARY_DLSYM) logging_logging_test_SOURCES = logging/logging_test.c logging_logging_vty_test_SOURCES = logging/logging_vty_test.c -logging_logging_vty_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la +logging_logging_vty_test_LDADD = $(top_builddir)/src/vty/libosmovty.la $(LDADD) vty_vty_transcript_test_SOURCES = vty/vty_transcript_test.c -vty_vty_transcript_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la +vty_vty_transcript_test_LDADD = $(top_builddir)/src/vty/libosmovty.la $(LDADD) fr_fr_test_SOURCES = fr/fr_test.c -fr_fr_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la \ +fr_fr_test_LDADD = $(top_builddir)/src/gb/libosmogb.la \ $(top_builddir)/src/vty/libosmovty.la \ $(top_builddir)/src/gsm/libosmogsm.la \ + $(LDADD) \ $(LIBRARY_DLSYM) codec_codec_test_SOURCES = codec/codec_test.c -codec_codec_test_LDADD = $(LDADD) $(top_builddir)/src/codec/libosmocodec.la +codec_codec_test_LDADD = $(top_builddir)/src/codec/libosmocodec.la $(LDADD) codec_codec_ecu_fr_test_SOURCES = codec/codec_ecu_fr_test.c -codec_codec_ecu_fr_test_LDADD = $(LDADD) $(top_builddir)/src/codec/libosmocodec.la +codec_codec_ecu_fr_test_LDADD = $(top_builddir)/src/codec/libosmocodec.la $(LDADD) loggingrb_loggingrb_test_SOURCES = loggingrb/loggingrb_test.c loggingrb_loggingrb_test_LDADD = $(LDADD) @@ -249,30 +256,31 @@ strrb_strrb_test_SOURCES = strrb/strrb_test.c vty_vty_test_SOURCES = vty/vty_test.c -vty_vty_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la +vty_vty_test_LDADD = $(top_builddir)/src/vty/libosmovty.la $(LDADD) sim_sim_test_SOURCES = sim/sim_test.c -sim_sim_test_LDADD = $(LDADD) $(top_builddir)/src/sim/libosmosim.la \ - $(top_builddir)/src/gsm/libosmogsm.la +sim_sim_test_LDADD = $(top_builddir)/src/sim/libosmosim.la \ + $(top_builddir)/src/gsm/libosmogsm.la \ + $(LDADD) tlv_tlv_test_SOURCES = tlv/tlv_test.c -tlv_tlv_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +tlv_tlv_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) gsup_gsup_test_SOURCES = gsup/gsup_test.c -gsup_gsup_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +gsup_gsup_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) oap_oap_test_SOURCES = oap/oap_test.c -oap_oap_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +oap_oap_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) oap_oap_client_test_SOURCES = oap/oap_client_test.c -oap_oap_client_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +oap_oap_client_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) fsm_fsm_test_SOURCES = fsm/fsm_test.c fsm_fsm_test_LDADD = \ - $(LDADD) \ $(top_builddir)/src/ctrl/libosmoctrl.la \ $(top_builddir)/src/gsm/libosmogsm.la \ - $(top_builddir)/src/vty/libosmovty.la + $(top_builddir)/src/vty/libosmovty.la \ + $(LDADD) fsm_fsm_dealloc_test_SOURCES = fsm/fsm_dealloc_test.c fsm_fsm_dealloc_test_LDADD = $(LDADD) @@ -282,10 +290,11 @@ socket_socket_test_SOURCES = socket/socket_test.c coding_coding_test_SOURCES = coding/coding_test.c -coding_coding_test_LDADD = $(LDADD) \ +coding_coding_test_LDADD = \ $(top_builddir)/src/gsm/libosmogsm.la \ $(top_builddir)/src/codec/libosmocodec.la \ - $(top_builddir)/src/coding/libosmocoding.la + $(top_builddir)/src/coding/libosmocoding.la \ + $(LDADD) endian_endian_test_SOURCES = endian/endian_test.c @@ -294,22 +303,22 @@ prbs_prbs_test_SOURCES = prbs/prbs_test.c gsm23003_gsm23003_test_SOURCES = gsm23003/gsm23003_test.c -gsm23003_gsm23003_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +gsm23003_gsm23003_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) gsm23236_gsm23236_test_SOURCES = gsm23236/gsm23236_test.c -gsm23236_gsm23236_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +gsm23236_gsm23236_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) tdef_tdef_test_SOURCES = tdef/tdef_test.c tdef_tdef_test_LDADD = $(LDADD) tdef_tdef_vty_config_root_test_SOURCES = tdef/tdef_vty_config_root_test.c -tdef_tdef_vty_config_root_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la +tdef_tdef_vty_config_root_test_LDADD = $(top_builddir)/src/vty/libosmovty.la $(LDADD) tdef_tdef_vty_config_subnode_test_SOURCES = tdef/tdef_vty_config_subnode_test.c -tdef_tdef_vty_config_subnode_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la +tdef_tdef_vty_config_subnode_test_LDADD = $(top_builddir)/src/vty/libosmovty.la $(LDADD) tdef_tdef_vty_dynamic_test_SOURCES = tdef/tdef_vty_dynamic_test.c -tdef_tdef_vty_dynamic_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la +tdef_tdef_vty_dynamic_test_LDADD = $(top_builddir)/src/vty/libosmovty.la $(LDADD) sockaddr_str_sockaddr_str_test_SOURCES = sockaddr_str/sockaddr_str_test.c sockaddr_str_sockaddr_str_test_LDADD = $(LDADD) @@ -324,19 +333,19 @@ exec_exec_test_LDADD = $(LDADD) i460_mux_i460_mux_test_SOURCES = i460_mux/i460_mux_test.c -i460_mux_i460_mux_test_LDADD = $(LDADD) $(top_builddir)/src/isdn/libosmoisdn.la +i460_mux_i460_mux_test_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la $(LDADD) bitgen_bitgen_test_SOURCES = bitgen/bitgen_test.c bitgen_bitgen_test_LDADD = $(LDADD) gad_gad_test_SOURCES = gad/gad_test.c -gad_gad_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +gad_gad_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) bsslap_bsslap_test_SOURCES = bsslap/bsslap_test.c -bsslap_bsslap_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +bsslap_bsslap_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) bssmap_le_bssmap_le_test_SOURCES = bssmap_le/bssmap_le_test.c -bssmap_le_bssmap_le_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +bssmap_le_bssmap_le_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) it_q_it_q_test_SOURCES = it_q/it_q_test.c it_q_it_q_test_LDADD = $(LDADD) @@ -345,17 +354,18 @@ time_cc_time_cc_test_LDADD = $(LDADD) iuup_iuup_test_SOURCES = iuup/iuup_test.c -iuup_iuup_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +iuup_iuup_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) v110_test_frame_SOURCES = v110/test_frame.c -v110_test_frame_LDADD = $(LDADD) $(top_builddir)/src/isdn/libosmoisdn.la +v110_test_frame_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la $(LDADD) v110_test_ra1_SOURCES = v110/test_ra1.c -v110_test_ra1_LDADD = $(LDADD) $(top_builddir)/src/isdn/libosmoisdn.la +v110_test_ra1_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la $(LDADD) gsm44021_test_frame_csd_SOURCES = gsm44021/test_frame_csd.c -gsm44021_test_frame_csd_LDADD = $(LDADD) $(top_builddir)/src/isdn/libosmoisdn.la \ - $(top_builddir)/src/gsm/libosmogsm.la +gsm44021_test_frame_csd_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la \ + $(top_builddir)/src/gsm/libosmogsm.la \ + $(LDADD) # The `:;' works around a Bash 3.2 bug when the output is not writeable. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31908 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifb3686f78432ac877c596004646506c540b23c53 Gerrit-Change-Number: 31908 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-trx[master]: CommonLibs: clean up and fix Makefile.am
by fixeria 14 Mar '23

14 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/31854 ) Change subject: CommonLibs: clean up and fix Makefile.am ...................................................................... CommonLibs: clean up and fix Makefile.am * Do not hard-code '-O3' and '-g', let the user decide on them. * Move '-lpthread' to LIBADD, it shall not be in CFLAGS. * Also add '-Wall' to AM_CFLAGS. Change-Id: Ia971fc4124b405514792e5309d42936aaebdc8c1 --- M CommonLibs/Makefile.am 1 file changed, 21 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/CommonLibs/Makefile.am b/CommonLibs/Makefile.am index 2c449e0..4a0652d 100644 --- a/CommonLibs/Makefile.am +++ b/CommonLibs/Makefile.am @@ -22,8 +22,8 @@ include $(top_srcdir)/Makefile.common AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) -AM_CXXFLAGS = -Wall -O3 -g -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) -AM_CFLAGS = $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) +AM_CXXFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) noinst_LTLIBRARIES = libcommon.la @@ -37,7 +37,12 @@ trx_rate_ctr.cpp \ trx_vty.c \ debug.c -libcommon_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS) +libcommon_la_LIBADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOCTRL_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + -lpthread \ + $(NULL) noinst_HEADERS = \ BitVector.h \ -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/31854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia971fc4124b405514792e5309d42936aaebdc8c1 Gerrit-Change-Number: 31854 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-trx[master]: ipc-driver-test: clean up variables in Makefile.am
by fixeria 14 Mar '23

14 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/31800 ) Change subject: ipc-driver-test: clean up variables in Makefile.am ...................................................................... ipc-driver-test: clean up variables in Makefile.am * AM_CPPFLAGS is for preprocessor flags like '-I' or '-D', * AM_CFLAGS/AM_CXXFLAGS is for C/C++ compiler flags like '-Wall', * AM_LDFLAGS is for linker flags like '-no-undefined', not libraries! * Link ipc-driver-test against libdevice.la, * Do not put $(UHD_CFLAGS) everywhere. Change-Id: Iafd68974c9c613fb4e65a01d076b2c687b716c83 --- M Transceiver52M/device/ipc/Makefile.am 1 file changed, 28 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/device/ipc/Makefile.am b/Transceiver52M/device/ipc/Makefile.am index 1653663..c08621f 100644 --- a/Transceiver52M/device/ipc/Makefile.am +++ b/Transceiver52M/device/ipc/Makefile.am @@ -1,9 +1,8 @@ include $(top_srcdir)/Makefile.common -AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common -AM_CFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) -AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) -AM_LDFLAGS = -lpthread -lrt +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(UHD_CFLAGS) +AM_CXXFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(UHD_CFLAGS) noinst_HEADERS = IPCDevice.h shm.h ipc_shm.h ipc_chan.h ipc_sock.h @@ -14,22 +13,22 @@ noinst_LTLIBRARIES = libdevice.la libdevice_la_SOURCES = IPCDevice.cpp shm.c ipc_shm.c ipc_chan.c ipc_sock.c -libdevice_la_LIBADD = $(top_builddir)/Transceiver52M/device/common/libdevice_common.la -libdevice_la_CXXFLAGS = $(AM_CXXFLAGS) -DIPCMAGIC +libdevice_la_CPPFLAGS = $(AM_CPPFLAGS) -DIPCMAGIC +libdevice_la_LIBADD = \ + $(top_builddir)/Transceiver52M/device/common/libdevice_common.la \ + -lpthread \ + -lrt \ + $(NULL) if DEVICE_UHD bin_PROGRAMS = ipc-driver-test #ipc_driver_test_SHORTNAME = drvt -ipc_driver_test_SOURCES = ipc-driver-test.c uhdwrap.cpp ipc_shm.c ipc_chan.c ipc_sock.c ../uhd/UHDDevice.cpp +ipc_driver_test_SOURCES = ipc-driver-test.c uhdwrap.cpp ../uhd/UHDDevice.cpp ipc_driver_test_LDADD = \ - shm.lo \ - $(top_builddir)/Transceiver52M/device/common/libdevice_common.la \ - $(COMMON_LA) + libdevice.la \ + $(COMMON_LA) \ $(LIBOSMOCORE_LIBS) \ + $(UHD_LIBS) \ $(NULL) -ipc_driver_test_CXXFLAGS = $(AM_CXXFLAGS) $(UHD_CFLAGS) -ipc_driver_test_CPPFLAGS = $(AM_CPPFLAGS) $(UHD_CFLAGS) -ipc_driver_test_CFLAGS = $(AM_CFLAGS) $(UHD_CFLAGS) -ipc_driver_test_LDFLAGS = $(AM_LDFLAGS) $(UHD_LIBS) endif -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/31800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iafd68974c9c613fb4e65a01d076b2c687b716c83 Gerrit-Change-Number: 31800 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-trx[master]: CommonLibs: remove unused *trx in cfg[_no]_ctr_error_threshold_cmd
by fixeria 14 Mar '23

14 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/31856 ) Change subject: CommonLibs: remove unused *trx in cfg[_no]_ctr_error_threshold_cmd ...................................................................... CommonLibs: remove unused *trx in cfg[_no]_ctr_error_threshold_cmd Compilation fails when building with -Wall and -Werror: trx_vty.c: In function ‘cfg_ctr_error_threshold’: trx_vty.c:469:18: error: unused variable ‘trx’ [-Werror=unused-variable] struct trx_ctx *trx = trx_from_vty(vty); ^~~ trx_vty.c: In function ‘cfg_no_ctr_error_threshold’: trx_vty.c:501:18: error: unused variable ‘trx’ [-Werror=unused-variable] struct trx_ctx *trx = trx_from_vty(vty); ^~~ Change-Id: I3d74c3f38aa03608a32b9dee472e49236543c87f --- M CommonLibs/trx_vty.c 1 file changed, 20 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index 2b0ba71..ba55f92 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -466,7 +466,6 @@ int rc; struct ctr_threshold ctr; - struct trx_ctx *trx = trx_from_vty(vty); rc = vty_ctr_name_2_id(argv[0]); if (rc < 0) { vty_out(vty, "No valid ctr_name found for ctr-error-threshold %s%s", @@ -498,7 +497,6 @@ int rc; struct ctr_threshold ctr; - struct trx_ctx *trx = trx_from_vty(vty); rc = vty_ctr_name_2_id(argv[0]); if (rc < 0) { vty_out(vty, "No valid ctr_name found for ctr-error-threshold %s%s", -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/31856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3d74c3f38aa03608a32b9dee472e49236543c87f Gerrit-Change-Number: 31856 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: tests/Makefile.am: Drop duplicated libosmogb.la in LDADD
by pespin 14 Mar '23

14 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/31907 ) Change subject: tests/Makefile.am: Drop duplicated libosmogb.la in LDADD ...................................................................... tests/Makefile.am: Drop duplicated libosmogb.la in LDADD Change-Id: I20e815ba5dc473c644e1098f2347b183f215a51a --- M tests/Makefile.am 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/07/31907/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 2f5eb01..2ec173b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -198,14 +198,14 @@ $(top_builddir)/src/gsm/libosmogsm.la gb_gprs_bssgp_test_SOURCES = gb/gprs_bssgp_test.c -gb_gprs_bssgp_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la \ +gb_gprs_bssgp_test_LDADD = $(LDADD) \ $(top_builddir)/src/vty/libosmovty.la \ $(top_builddir)/src/gsm/libosmogsm.la \ $(top_builddir)/src/gb/libosmogb.la \ $(LIBRARY_DLSYM) gb_gprs_bssgp_rim_test_SOURCES = gb/gprs_bssgp_rim_test.c -gb_gprs_bssgp_rim_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la \ +gb_gprs_bssgp_rim_test_LDADD = $(LDADD) \ $(top_builddir)/src/gb/libosmogb.la \ $(LIBRARY_DLSYM) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I20e815ba5dc473c644e1098f2347b183f215a51a Gerrit-Change-Number: 31907 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-trx[master]: ipc-driver-test: clean up variables in Makefile.am
by pespin 14 Mar '23

14 Mar '23

Attention is currently required from: Hoernchen, fixeria, msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/31800 ) Change subject: ipc-driver-test: clean up variables in Makefile.am ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/31800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iafd68974c9c613fb4e65a01d076b2c687b716c83 Gerrit-Change-Number: 31800 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Mar 2023 13:10:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0