July 2025 - gerrit-log - lists.osmocom.org

[XS] Change in ...osmo-s1gw[master]: Makefile: 'run' becomes an alias of 'shell'
by pespin 28 Jul '25

28 Jul '25

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40757?usp=email ) Change subject: Makefile: 'run' becomes an alias of 'shell' ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: I'm not sure why we need a make run isntread of make shell, but ok. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40757?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I8b34c11cc9361d8b65316401f67a5038544b27ac Gerrit-Change-Number: 40757 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Jul 2025 10:07:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[XS] Change in ...osmo-s1gw[master]: rebar.config: tune default relx configuration
by pespin 28 Jul '25

28 Jul '25

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40755?usp=email ) Change subject: rebar.config: tune default relx configuration ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40755?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I296c859e088f5034bf4832e70a2b63304f5e421a Gerrit-Change-Number: 40755 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Jul 2025 10:02:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in ...osmo-s1gw[master]: systemd: add CAP_NET_ADMIN for running with GTPU KPI
by pespin 28 Jul '25

28 Jul '25

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40754?usp=email ) Change subject: systemd: add CAP_NET_ADMIN for running with GTPU KPI ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40754?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I84331740698d39511755189e35fdbd5c680b1983 Gerrit-Change-Number: 40754 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Jul 2025 10:01:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in ...osmo-s1gw[master]: debian/control: add Vcs-Git, Vcs-Browser, Homepage
by pespin 28 Jul '25

28 Jul '25

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40758?usp=email ) Change subject: debian/control: add Vcs-Git, Vcs-Browser, Homepage ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40758?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I8e3f20779cfef785bb0f48c2d20f45898af37ec2 Gerrit-Change-Number: 40758 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Jul 2025 10:01:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in pysim[master]: pySim.esim.saip.FsNodeADF: Fix __str__ method
by laforge 27 Jul '25

27 Jul '25

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/40759?usp=email ) Change subject: pySim.esim.saip.FsNodeADF: Fix __str__ method ...................................................................... pySim.esim.saip.FsNodeADF: Fix __str__ method It's quite common for a FsNodeADF to not have a df_name, so we need to guard against that during stringification to avoid an exception. Change-Id: I919d7c46575e0ebcdf3b979347a5cdd1a9feb294 --- M pySim/esim/saip/__init__.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/59/40759/1 diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 305a373..7646989 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -2040,7 +2040,8 @@ super().__init__(fid, parent, file, name) def __str__(self): - return '%s(%s)' % (self.__class__.__name__, b2h(self.df_name)) + # self.df_name is usually None for an ADF like ADF.USIM or ADF.ISIM so we need to guard against it + return '%s(%s)' % (self.__class__.__name__, b2h(self.df_name) if self.df_name else None) class FsNodeMF(FsNodeDF): """The MF (Master File) in the filesystem hierarchy.""" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40759?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I919d7c46575e0ebcdf3b979347a5cdd1a9feb294 Gerrit-Change-Number: 40759 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in ...osmo-s1gw[master]: Makefile: 'run' becomes an alias of 'shell'
by fixeria 26 Jul '25

26 Jul '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40757?usp=email ) Change subject: Makefile: 'run' becomes an alias of 'shell' ...................................................................... Makefile: 'run' becomes an alias of 'shell' Running osmo-s1gw in form of an escript executable is prone to errors. * Move away from escript and make 'run' an alias of 'shell'. * Move `rebar3 escriptize` to a dedicated 'escript' recipe. * Add 'run-escript' recipe in case its ever needed. Change-Id: I8b34c11cc9361d8b65316401f67a5038544b27ac Related: SYS#7332 --- M Makefile 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/57/40757/1 diff --git a/Makefile b/Makefile index fd9d1ae..14ebc69 100644 --- a/Makefile +++ b/Makefile @@ -17,11 +17,15 @@ build: $(GEN_FILES) rebar3 compile + +escript: $(GEN_FILES) rebar3 escriptize -run: build +run-escript: escript ERL_FLAGS='-config $(CONFIG)' _build/default/bin/osmo-s1gw +run: shell + shell: build rebar3 shell --config $(CONFIG) -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40757?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I8b34c11cc9361d8b65316401f67a5038544b27ac Gerrit-Change-Number: 40757 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: rebar.config: tune default relx configuration
by fixeria 26 Jul '25

26 Jul '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40755?usp=email ) Change subject: rebar.config: tune default relx configuration ...................................................................... rebar.config: tune default relx configuration This is an explicit equivalent of {mode, prod}: * {dev_mode, false} -- this makes rebar3/relx actually copy the relevant files instaed of creating symlinks * {include_src, false} -- this disables inclusion of source code * {include_erts, true} -- this enables inclusion of the ERTS See also: https://rebar3.org/docs/deployment/releases/. The benefits of including the ERTS (Erlang Runtime System) are: * Self-contained: releases can be deployed anywhere, regardless of what's installed on the target system. * Consistent runtime: we can pin the exact Erlang/OTP version. Change-Id: I296c859e088f5034bf4832e70a2b63304f5e421a Related: SYS#7332 --- M rebar.config 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/55/40755/1 diff --git a/rebar.config b/rebar.config index 4be5a1c..47ff372 100644 --- a/rebar.config +++ b/rebar.config @@ -44,8 +44,9 @@ {relx, [{release, {'osmo-s1gw', semver}, [osmo_s1gw]}, {sys_config, "./config/sys.config"}, - {dev_mode, true}, - {include_erts, false}, + {dev_mode, false}, + {include_src, false}, + {include_erts, true}, {extended_start_script, true}]}. %% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40755?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I296c859e088f5034bf4832e70a2b63304f5e421a Gerrit-Change-Number: 40755 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: debian/control: add Vcs-Git, Vcs-Browser, Homepage
by fixeria 26 Jul '25

26 Jul '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40758?usp=email ) Change subject: debian/control: add Vcs-Git, Vcs-Browser, Homepage ...................................................................... debian/control: add Vcs-Git, Vcs-Browser, Homepage Change-Id: I8e3f20779cfef785bb0f48c2d20f45898af37ec2 Related: SYS#7332 --- M debian/control 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/58/40758/1 diff --git a/debian/control b/debian/control index 8240677..f5dda19 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,9 @@ rebar3, debhelper (>= 10) Standards-Version: 4.5.0 +Vcs-Git: https://gitea.osmocom.org/erlang/osmo-s1gw +Vcs-Browser: https://gitea.osmocom.org/erlang/osmo-s1gw +Homepage: https://osmocom.org/projects/osmo-s1gw Package: osmo-s1gw Architecture: any -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40758?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I8e3f20779cfef785bb0f48c2d20f45898af37ec2 Gerrit-Change-Number: 40758 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in ...osmo-s1gw[master]: Makefile: generate and install complete release package
by fixeria 26 Jul '25

26 Jul '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40756?usp=email ) Change subject: Makefile: generate and install complete release package ...................................................................... Makefile: generate and install complete release package Previously, our Debian packages installed osmo-s1gw as an escript executable - essentially a self-unpacking zip archive containing *.app and *.beam files, similar to a Java JAR. This was generated using `rebar3 escriptize` and worked well for some time. However, at some point we started hitting bugs and limitations with this approach, prompting a change to packaging osmo-s1gw as a standard OTP-style BEAM application. This patch resolves those issues and aligns better with typical Erlang deployment practices. The default rebar3-generated start script daemonizes (double‑forks) and wraps erlexec in complex shell logic that does not play well with systemd (e.g. erl_child_setup failures). Thus we provide a custom script that calls erlexec directly, avoids double‑forking, and adds some user-friendly command line options. The resulting package no longer depends on `erlang-nox` since it includes the ERTS (Erlang Runtime System). This ensures consistent behavior across different environments and simplifies deployment. Change-Id: I5681ca103daf1c497218b4513b0ca97b1aae03d3 Related: SYS#7332 --- M Makefile A contrib/osmo-s1gw.sh M contrib/systemd/osmo-s1gw.service M debian/control 4 files changed, 80 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/56/40756/1 diff --git a/Makefile b/Makefile index ad7b531..fd9d1ae 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ EUNIT_ARGS ?= # directory paths for 'install' BINDIR ?= /usr/bin +LIBDIR ?= /usr/lib CONFDIR ?= /etc/osmocom SYSTEMDUNITDIR ?= /lib/systemd/system @@ -30,8 +31,13 @@ analyze: $(GEN_FILES) rebar3 dialyzer -install: build - install -Dm0755 _build/default/bin/osmo-s1gw \ +release: $(GEN_FILES) + rebar3 release + +install: release + install -d $(DESTDIR)$(LIBDIR) + cp -r _build/default/rel/osmo-s1gw $(DESTDIR)$(LIBDIR)/ + install -Dm0755 contrib/osmo-s1gw.sh \ $(DESTDIR)$(BINDIR)/osmo-s1gw install -Dm0644 config/sys.config \ $(DESTDIR)$(CONFDIR)/osmo-s1gw.config diff --git a/contrib/osmo-s1gw.sh b/contrib/osmo-s1gw.sh new file mode 100755 index 0000000..3db44b6 --- /dev/null +++ b/contrib/osmo-s1gw.sh @@ -0,0 +1,67 @@ +#!/bin/sh -e + +# Simple boot script for Erlang/OTP releases that be used in systemd unit files. + +APP_NAME=osmo-s1gw + +# --- Parse options --- +ROOTDIR=${ROOTDIR:-"/usr/lib/${APP_NAME}"} +CONFIG="/etc/osmocom/${APP_NAME}.config" +COOKIE="${APP_NAME}" +NODE_NAME="${APP_NAME}@$(uname -n)" +ERL_SHELL="-noshell -noinput" + +while getopts "c:C:n:r:s" opt; do + case "$opt" in + c) + CONFIG="$OPTARG" + ;; + C) + COOKIE="$OPTARG" + ;; + n) + NODE_NAME="$OPTARG" + ;; + r) + ROOTDIR=$(realpath "$OPTARG") + ;; + s) + ERL_SHELL="-shell" + ;; + *) + echo "Usage: $0 [-s] [-r ROOTDIR] [-c CONFIG] [-C COOKIE] [-n NAME@HOST]" + exit 1 + ;; + esac +done + +if [ ! -d "${ROOTDIR}" ]; then + echo "Error: ROOTDIR=${ROOTDIR} does not exist" + echo "Please specify the root directory using '-r' or via the environment" + exit 1 +fi + +if [ -z "${ERTS_DIR}" ]; then + ERTS_VSN=$(grep "^ERTS_VSN=" ${ROOTDIR}/bin/${APP_NAME} | cut -d'"' -f2) + ERTS_DIR=${ERTS_DIR:-"${ROOTDIR}/erts-${ERTS_VSN}"} +fi + +if [ -z "${REL_DIR}" ]; then + REL_VSN=$(grep "^REL_VSN=" ${ROOTDIR}/bin/${APP_NAME} | cut -d'"' -f2) + REL_DIR="${ROOTDIR}/releases/${REL_VSN}" +fi + +[ -f "${REL_DIR}/${APP_NAME}.boot" ] && BOOTFILE="${APP_NAME}" || BOOTFILE=start + +export BINDIR="${ERTS_DIR}/bin" + +exec ${BINDIR}/erlexec \ + +C multi_time_warp \ + -boot "${REL_DIR}/${BOOTFILE}" \ + -config "${CONFIG}" \ + -setcookie "${COOKIE}" \ + -sname "${NODE_NAME}" \ + -mode embedded \ + ${ERL_SHELL} + +# vim:set ts=2 sw=2 et: diff --git a/contrib/systemd/osmo-s1gw.service b/contrib/systemd/osmo-s1gw.service index a265964..707bdae 100644 --- a/contrib/systemd/osmo-s1gw.service +++ b/contrib/systemd/osmo-s1gw.service @@ -5,14 +5,13 @@ [Service] Type=simple -Restart=always +Restart=on-failure StateDirectory=osmo-s1gw WorkingDirectory=%S/osmo-s1gw User=osmocom Group=osmocom Environment="HOME=/var/lib/osmo-s1gw" -Environment="ERL_FLAGS=-config /etc/osmocom/osmo-s1gw.config" -ExecStart=/usr/bin/osmo-s1gw foreground +ExecStart=/usr/bin/osmo-s1gw -c /etc/osmocom/osmo-s1gw.config CapabilityBoundingSet=CAP_NET_ADMIN AmbientCapabilities=CAP_NET_ADMIN RestartSec=2 diff --git a/debian/control b/debian/control index 10eddac..8240677 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,9 @@ Package: osmo-s1gw Architecture: any -Depends: erlang-nox -Multi-Arch: allowed +Depends: ${shlibs:Depends}, + ${misc:Depends} +Multi-Arch: foreign Description: Osmocom S1 gateway This can be used on the S1 interface between eNB and MME/CN, and acts as separation between the eNB-facing IP network and the -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40756?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I5681ca103daf1c497218b4513b0ca97b1aae03d3 Gerrit-Change-Number: 40756 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: systemd: add CAP_NET_ADMIN for running with GTPU KPI
by fixeria 26 Jul '25

26 Jul '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40754?usp=email ) Change subject: systemd: add CAP_NET_ADMIN for running with GTPU KPI ...................................................................... systemd: add CAP_NET_ADMIN for running with GTPU KPI Change-Id: I84331740698d39511755189e35fdbd5c680b1983 Related: SYS#7307 --- M contrib/systemd/osmo-s1gw.service 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/54/40754/1 diff --git a/contrib/systemd/osmo-s1gw.service b/contrib/systemd/osmo-s1gw.service index f19354a..a265964 100644 --- a/contrib/systemd/osmo-s1gw.service +++ b/contrib/systemd/osmo-s1gw.service @@ -13,6 +13,8 @@ Environment="HOME=/var/lib/osmo-s1gw" Environment="ERL_FLAGS=-config /etc/osmocom/osmo-s1gw.config" ExecStart=/usr/bin/osmo-s1gw foreground +CapabilityBoundingSet=CAP_NET_ADMIN +AmbientCapabilities=CAP_NET_ADMIN RestartSec=2 [Install] -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40754?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I84331740698d39511755189e35fdbd5c680b1983 Gerrit-Change-Number: 40754 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0