osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/31726 )
Change subject: build/Makefile.common.inc: unset OSMO_REPOSITORY
......................................................................
build/Makefile.common.inc: unset OSMO_REPOSITORY
Don't have a default value for OSMO_REPOSITORY, as this leads to manuals
getting uploaded to the wrong directory (publish) target and installed
to the wrong directory (install, uninstall).
Add checks to ensure the variable is set before using it in install and
uninstall.
Related: OS#5902
Change-Id: Ie21d58dd57a893a83f566eea464ab3eec82b67a4
---
M build/Makefile.common.inc
M tests/Makefile.am
2 files changed, 20 insertions(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
msuraev: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/build/Makefile.common.inc b/build/Makefile.common.inc
index a9a8ddf..2bbd324 100644
--- a/build/Makefile.common.inc
+++ b/build/Makefile.common.inc
@@ -11,7 +11,6 @@
SYMLINKS = common build
CLEAN_FILES += $(SYMLINKS)
PDF_FILES = $(patsubst %.adoc,%.pdf,$(ASCIIDOC)) $(patsubst %.xml,%.pdf,$(VTY_REFERENCE))
-OSMO_REPOSITORY ?= osmo-gsm-manuals
PUBLISH_REF ?= master
PUBLISH_TEMPDIR = _publish_tmpdir
@@ -49,6 +48,7 @@
# - installing manuals by default is fine, because Osmocom projects won't include
# the whole Makefile.common.inc unless --enable-manuals is passed to configure.
install: $(PDF_FILES)
+ [ -n "$(OSMO_REPOSITORY)" ] || exit 1
if [ "$(OSMO_GSM_MANUALS_NO_INSTALL)" != "1" ]; then \
for i in $(PDF_FILES); do \
install -vDm644 "$$i" "$(DESTDIR)$(prefix)/share/doc/$(OSMO_REPOSITORY)-doc/$$i" || exit 1; \
@@ -56,6 +56,7 @@
fi
uninstall:
+ [ -n "$(OSMO_REPOSITORY)" ] || exit 1
if [ "$(OSMO_GSM_MANUALS_NO_INSTALL)" != "1" ]; then \
for i in $(PDF_FILES); do \
rm -v "$(DESTDIR)$(prefix)/share/doc/$(OSMO_REPOSITORY)-doc/$$i"; \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 784f61f..0761d48 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -34,6 +34,7 @@
VTY_REFERENCE = test-vty-reference.xml test2-vty-reference.xml
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc
+OSMO_REPOSITORY = osmo-gsm-manuals
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/31726
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Change-Id: Ie21d58dd57a893a83f566eea464ab3eec82b67a4
Gerrit-Change-Number: 31726
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: neels.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31767 )
Change subject: hnbgw: add f_bssap_expect()
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
see previous comment about function vs. altstep
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31767
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: I51c60ed8fcef83c98e6c62c9f62a8c3c665de860
Gerrit-Change-Number: 31767
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 09 Mar 2023 09:35:19 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: neels.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31766 )
Change subject: hnbgw: add f_pfcp_expect()
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
see previous comment about function vs. altstep
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31766
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: I2117475b695d486b1204d61e5bb21120a6187354
Gerrit-Change-Number: 31766
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 09 Mar 2023 09:35:14 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: neels.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31765 )
Change subject: hnbgw: add f_rua_expect()
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
I'm not sure if this is really best handled in a function. The problem with functions is that you can always only call one of them at a time. In more complex tests, this may no longer be feasible.
Those could however simply be altsteps. With altsteps, a more complex testcase could combine any number of those together in an alt. See for example BSC_Tests.ttcn f_TC_reassignment_codec where two altsteps are combined in a local 'alt'.
I'm not sure if this really makes sense here, but would like you to think about it.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31765
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: I29e6b7659ba53efee9f676197b502f79780ead7e
Gerrit-Change-Number: 31765
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 09 Mar 2023 09:34:58 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: osmith, neels, fixeria, msuraev.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31513 )
Change subject: GSMTAP: allow configuring src IP for log messages
......................................................................
Patch Set 12: Code-Review-1
(4 comments)
File src/core/logging_gsmtap.c:
https://gerrit.osmocom.org/c/libosmocore/+/31513/comment/e5018e7d_286b2311
PS12, Line 132: gsmtap_source_free(target->tgt_gsmtap.gsmtap_inst);
You could try comparing if new ip if same as the old one and then do nothing. Otherwise you are recreating the whole thing every time you enter the VTY node (potentially recreating the socket?)
https://gerrit.osmocom.org/c/libosmocore/+/31513/comment/bea02783_56d5fb24
PS12, Line 139: if (ip)
if without {} and else with them. Fix.
https://gerrit.osmocom.org/c/libosmocore/+/31513/comment/89db26fd_92b61a6f
PS12, Line 186: target->tgt_gsmtap.src_addr = talloc_strdup(target, src);
I hope arget->tgt_gsmtap.src_addr is NULL here and we are not leaking.
File utils/osmo-stat-dummy/osmo-stat-dummy.cfg:
https://gerrit.osmocom.org/c/libosmocore/+/31513/comment/c858fd48_6e927ac2
PS4, Line 1: log gsmtap 127.0.0.69 127.6.9.1
> Not sure I'm following - 127.0.0.1/8 always exist. […]
1- 127.0.0.1/8 always exist on linux for IPv4 (not even the case for IPv6 iirc).
2- I still don't see the point on why do you want to set a specific source IP address there. As a default, letting the kernel decide the src IP address based on current routing table is a better solution as per user expectancies.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31513
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I9000269ce5b3dce1e757271b7c42e77b68d38f25
Gerrit-Change-Number: 31513
Gerrit-PatchSet: 12
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 09 Mar 2023 09:33:35 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de>
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/31742 )
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(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/doc/sequence_charts/Makefile.am b/doc/sequence_charts/Makefile.am
index 5efe855..c119458 100644
--- a/doc/sequence_charts/Makefile.am
+++ b/doc/sequence_charts/Makefile.am
@@ -4,17 +4,11 @@
charts: msc dot
EXTRA_DIST = \
- inter_bsc_ho.msc \
- inter_msc_ho.msc \
- mncc_call_fsm.msc \
- call_reestablishment.msc \
+ $(srcdir)/*.msc \
$(NULL)
CLEANFILES = \
- inter_bsc_ho.png \
- inter_msc_ho.png \
- mncc_call_fsm.png \
- voice_call_full.png \
+ $(builddir)/*.png \
$(NULL)
msc: \
--
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-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged