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

[S] Change in libosmo-pfcp[master]: build: drop COVERAGE
by neels 09 Mar '23

09 Mar '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/31761 ) Change subject: build: drop COVERAGE ...................................................................... build: drop COVERAGE There isn't even an --enable-coverage in the configure.ac, so drop the always empty COVERAGE_CFLAGS. Change-Id: Ib256ce7d979aec5c368b19ac2c145f75a9dab0fc --- M src/libosmo-gtlv/Makefile.am M src/libosmo-pfcp/Makefile.am 2 files changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/61/31761/1 diff --git a/src/libosmo-gtlv/Makefile.am b/src/libosmo-gtlv/Makefile.am index 1c40386..ae77948 100644 --- a/src/libosmo-gtlv/Makefile.am +++ b/src/libosmo-gtlv/Makefile.am @@ -8,12 +8,10 @@ AM_CFLAGS = \ -Wall \ $(LIBOSMOCORE_CFLAGS) \ - $(COVERAGE_CFLAGS) \ $(NULL) AM_LDFLAGS = \ $(LIBOSMOCORE_LIBS) \ - $(COVERAGE_LDFLAGS) \ $(NULL) lib_LTLIBRARIES = \ diff --git a/src/libosmo-pfcp/Makefile.am b/src/libosmo-pfcp/Makefile.am index 03e91df..a66a35d 100644 --- a/src/libosmo-pfcp/Makefile.am +++ b/src/libosmo-pfcp/Makefile.am @@ -10,7 +10,6 @@ -Wall \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ - $(COVERAGE_CFLAGS) \ $(NULL) lib_LTLIBRARIES = \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/31761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Ib256ce7d979aec5c368b19ac2c145f75a9dab0fc Gerrit-Change-Number: 31761 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-pfcp[master]: libosmo-gtlv/Makefile.am: drop unused AM_LDFLAGS
by neels 09 Mar '23

09 Mar '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/31762 ) Change subject: libosmo-gtlv/Makefile.am: drop unused AM_LDFLAGS ...................................................................... libosmo-gtlv/Makefile.am: drop unused AM_LDFLAGS The only item built here has its own LDFLAGS directive. Change-Id: I6fd777bed9366c35f5b1453cde1e6f5c1617e338 --- M src/libosmo-gtlv/Makefile.am 1 file changed, 11 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/62/31762/1 diff --git a/src/libosmo-gtlv/Makefile.am b/src/libosmo-gtlv/Makefile.am index ae77948..bb20fca 100644 --- a/src/libosmo-gtlv/Makefile.am +++ b/src/libosmo-gtlv/Makefile.am @@ -10,10 +10,6 @@ $(LIBOSMOCORE_CFLAGS) \ $(NULL) -AM_LDFLAGS = \ - $(LIBOSMOCORE_LIBS) \ - $(NULL) - lib_LTLIBRARIES = \ libosmo-gtlv.la \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/31762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I6fd777bed9366c35f5b1453cde1e6f5c1617e338 Gerrit-Change-Number: 31762 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-pfcp[master]: build: fix linking gen__pfcp_ies_auto to use build-tree libosmo-gtlv
by neels 09 Mar '23

09 Mar '23

Attention is currently required from: pespin, fixeria. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741 to look at the new patch set (#3). Change subject: build: fix linking gen__pfcp_ies_auto to use build-tree libosmo-gtlv ...................................................................... build: fix linking gen__pfcp_ies_auto to use build-tree libosmo-gtlv Resolve some confusion in src/libosmo-pfcp/Makefile.am: It builds - the libosmo-pfcp library. - the gen__pfcp_ies_auto tool to be used at build time. The library has its own LDFLAGS directive, so it does not used the global AM_LDFLAGS. So there is no point to have AM_LDFLAGS, and then additional gen__pfcp_ies_auto__LDADD, just have a gen__pfcp_ies_auto__LDFLAGS. Put the locally built dependency libosmo-gtlv.la first in this LDFLAGS, so that libtool takes it from the build tree, not a system installed lib (if any). Still keep the AM_CFLAGS, needed for #include paths for building libosmo-pfcp objects. However, no vty #includes are used, so drop LIBOSMOVTY_CFLAGS. Related: OS#5942 Change-Id: I2e92238b214d8e79bab1095d6093139bad05bc66 --- M src/libosmo-pfcp/Makefile.am 1 file changed, 31 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/41/31741/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I2e92238b214d8e79bab1095d6093139bad05bc66 Gerrit-Change-Number: 31741 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmo-pfcp[master]: build: fix linking gen__pfcp_ies_auto to use build-tree libosmo-gtlv
by neels 09 Mar '23

09 Mar '23

Attention is currently required from: pespin, fixeria. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741 to look at the new patch set (#2). Change subject: build: fix linking gen__pfcp_ies_auto to use build-tree libosmo-gtlv ...................................................................... build: fix linking gen__pfcp_ies_auto to use build-tree libosmo-gtlv Resolve some confusion in src/libosmo-pfcp/Makefile.am: It builds - the libosmo-pfcp library. - the gen__pfcp_ies_auto tool to be used at build time. The library has its own LDFLAGS directive, so it does not used the global AM_LDFLAGS. So there is no point to have AM_LDFLAGS, and then additional gen__pfcp_ies_auto__LDADD, just have a gen__pfcp_ies_auto__LDFLAGS. Put the locally built dependency libosmo-gtlv.la first in this LDFLAGS, so that libtool takes it from the build tree, not a system installed lib (if any). Still keep the AM_CFLAGS, needed for #include paths for building libosmo-pfcp objects. Related: OS#5942 Change-Id: I2e92238b214d8e79bab1095d6093139bad05bc66 --- M src/libosmo-pfcp/Makefile.am 1 file changed, 30 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/41/31741/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I2e92238b214d8e79bab1095d6093139bad05bc66 Gerrit-Change-Number: 31741 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmo-pfcp[master]: build: fix linking gen__pfcp_ies_auto to use build-tree libosmo-gtlv
by neels 09 Mar '23

09 Mar '23

Attention is currently required from: pespin, fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741 ) Change subject: build: fix linking gen__pfcp_ies_auto to use build-tree libosmo-gtlv ...................................................................... Patch Set 1: (1 comment) File src/libosmo-pfcp/Makefile.am: https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741/comment/7f30d7fa_0347fc4c PS1, Line 68: gen__pfcp_ies_auto_LDFLAGS > this is the same fix: LDADD I presume appends libs to the AM_LDFLAGS from above. […] erm ok, of course there is some linking phase for the library and it has LDFLAGS. What i meant is the library linking doesn't need to link the actual objects it depends on -- so the LDFLAGS for libosmo-pfcp doesn't need to link libosmocore.so or libosmogsm.so. And what i meant is the library has its own LDFLAGS directive, so it doesn't use the global AM_LDFLAGS directive. building the library still needs the CFLAGS for the #includes from the .c/.h files. only the gen__pfcp_... tool needs to add the actual FOO_LIBS to LDFLAGS to build the executable. so it will have its own LDFLAGS now. -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I2e92238b214d8e79bab1095d6093139bad05bc66 Gerrit-Change-Number: 31741 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 00:12:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmo-pfcp[master]: build: fix linking gen__pfcp_ies_auto to use build-tree libosmo-gtlv
by neels 09 Mar '23

09 Mar '23

Attention is currently required from: pespin, fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741 ) Change subject: build: fix linking gen__pfcp_ies_auto to use build-tree libosmo-gtlv ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: also gen__pfcp_ies_auto is a build-time tool to generate TLV parsing code. So I guess no coverage analysis (presume is what COVERAGE is all about) is even needed for this. right? so i'll jst drop COVERAGE -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I2e92238b214d8e79bab1095d6093139bad05bc66 Gerrit-Change-Number: 31741 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 00:03:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmo-pfcp[master]: build: fix linking gen__pfcp_ies_auto to use build-tree libosmo-gtlv
by neels 09 Mar '23

09 Mar '23

Attention is currently required from: pespin, fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741 ) Change subject: build: fix linking gen__pfcp_ies_auto to use build-tree libosmo-gtlv ...................................................................... Patch Set 1: (1 comment) File src/libosmo-pfcp/Makefile.am: https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741/comment/2d5cf2d4_f0584f21 PS1, Line 68: gen__pfcp_ies_auto_LDFLAGS > Regarding order: lower level libs (eg libosmcoore) should be *after* the libs depending on it. […] this is the same fix: LDADD I presume appends libs to the AM_LDFLAGS from above. Since AM_LDFLAGS include LIBOSMOCORE_LIBS, then the local lib is appended by LDADD after libosmocore, which then fails. By using LDFLAGS, not LDADD, the order is being fixed, because no other libs are listed before libosmo-gtlv.a. Now from a different angle, linking is only done for built programs. Since this Makefile.am builds only a library (not linked) and the gen__pfcp... program (linked), that means the global AM_LDFLAGS only applies to this gen__pfcp program anyway, so it makes no sense to set AM_LDFLAGS and then also have a separate LDFLAGS for the gen__pfcp program. I can just use either the global AM_LDFLAGS or a gen_pfcp_..._LDFLAGS. Hope this is correct now... certainly works on my box. re: "COVERAGE_LDFLAGS should be in gen__pfcp_ies_auto_LDFLAGS . Why are they mixed up?" But so far I don't understand why you would say that COVERAGE has to be in LDFLAGS, when both LDFLAGS and LDADD just end up adding cmdline args to the linker. should COVERAGE come first?? I presume LDFLAGS and LDADD are the same thing, one replaces the earlier LDFLAGS and the other doesn't replace but just append? I have no idea about COVERAGE_LDFLAGS, if that needs fixing let's do it in a separate patch. I don't even know what COVERAGE is supposed to do... just took it from another build tree. -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I2e92238b214d8e79bab1095d6093139bad05bc66 Gerrit-Change-Number: 31741 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 00:01:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmo-pfcp[master]: libosmo-pfcp.pc: move libosmogsm to Requires
by neels 08 Mar '23

08 Mar '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/31760 ) Change subject: libosmo-pfcp.pc: move libosmogsm to Requires ...................................................................... libosmo-pfcp.pc: move libosmogsm to Requires It appears Requires.private is not working as intended. Moving to Requires seems to fix the problem I am seeing on my machine: CCLD unique_ids_test /usr/bin/ld: /usr/local/lib/libosmo-pfcp.so: undefined reference to `osmo_apn_to_str' /usr/bin/ld: /usr/local/lib/libosmo-pfcp.so: undefined reference to `osmo_apn_from_str' Change-Id: I319173c1fab068dfe1361ae6cd02f729461d4cf8 --- M libosmo-pfcp.pc.in 1 file changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/60/31760/1 diff --git a/libosmo-pfcp.pc.in b/libosmo-pfcp.pc.in index 58a6164..cafbdd3 100644 --- a/libosmo-pfcp.pc.in +++ b/libosmo-pfcp.pc.in @@ -6,7 +6,6 @@ Name: Osmocom PFCP library Description: C Utility Library that implements the PFCP protocol and endpoint Version: @VERSION@ -Requires: libosmo-gtlv, libosmocore, talloc -Requires.private: libosmogsm +Requires: libosmo-gtlv, libosmogsm, libosmocore, talloc Libs: -L${libdir} -losmo-pfcp Cflags: -I${includedir}/ -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/31760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I319173c1fab068dfe1361ae6cd02f729461d4cf8 Gerrit-Change-Number: 31760 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: vty: codec-list: fix error message
by neels 08 Mar '23

08 Mar '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31759 ) Change subject: vty: codec-list: fix error message ...................................................................... vty: codec-list: fix error message Change-Id: I89460229f894bfa67c6939dc3825f1865378d918 --- M src/osmo-bsc/bsc_vty.c M tests/msc.vty 2 files changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/59/31759/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index c219ff4..0edb534 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -2752,7 +2752,7 @@ /* prevent duplicate entries */ for (j = 0; j < i; j++) { if (gsm_audio_support_cmp(&tmp[j], &tmp[i]) == 0) { - vty_out(vty, "duplicate entry in 'msc' / 'codec-support': %s%s", argv[i], VTY_NEWLINE); + vty_out(vty, "duplicate entry in 'msc' / 'codec-list': %s%s", arg, VTY_NEWLINE); return CMD_WARNING; } } diff --git a/tests/msc.vty b/tests/msc.vty index 74eca2a..d67f2b9 100644 --- a/tests/msc.vty +++ b/tests/msc.vty @@ -53,7 +53,7 @@ ... OsmoBSC(config-msc)# codec-list fr1 fr1 -duplicate entry in 'msc' / 'codec-support': fr1 +duplicate entry in 'msc' / 'codec-list': fr1 OsmoBSC(config-msc)# show running-config ... msc 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I89460229f894bfa67c6939dc3825f1865378d918 Gerrit-Change-Number: 31759 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: make: doc/sequence_charts: use wildcards for EXTRA_DIST and CLEANFILES
by neels 08 Mar '23

08 Mar '23

Attention is currently required from: neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/31742 to look at the new patch set (#2). Change subject: make: doc/sequence_charts: use wildcards for EXTRA_DIST and CLEANFILES ...................................................................... make: doc/sequence_charts: use wildcards for EXTRA_DIST and CLEANFILES Both EXTRA_DIST and CLEANFILES had missing entries. It is easy to forget to keep them up to date. Rather use wildcards to always pick up all relevant files. (Not adding *.dot because there are no .dot charts here, yet.) Change-Id: I3a18e4608a310169d7c9cd9c1b8ac9015a990920 --- M doc/sequence_charts/Makefile.am 1 file changed, 17 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/42/31742/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/31742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3a18e4608a310169d7c9cd9c1b8ac9015a990920 Gerrit-Change-Number: 31742 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0