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

[XS] Change in osmo-dev[master]: Add 'onomono-eim' project
by jolly 10 Jul '26

10 Jul '26

jolly has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/42973?usp=email ) Change subject: Add 'onomono-eim' project ...................................................................... Add 'onomono-eim' project Related: SYS#8100 Change-Id: I47bfc02397b6f97ad891fe4816763ba634df7934 --- M all.buildsystems M all.deps 2 files changed, 3 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/all.buildsystems b/all.buildsystems index 63eab23..9b27105 100644 --- a/all.buildsystems +++ b/all.buildsystems @@ -4,6 +4,7 @@ osmo-s1gw erlang osmo-epdg erlang osmo_dia2gsup erlang +onomondo-eim erlang comp128-python python gsm0338 python diff --git a/all.deps b/all.deps index f5148ca..8377998 100644 --- a/all.deps +++ b/all.deps @@ -44,6 +44,8 @@ open5gs +onomondo-eim + # can only clone these docker-playground osmo-ttcn3-hacks -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/42973?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I47bfc02397b6f97ad891fe4816763ba634df7934 Gerrit-Change-Number: 42973 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in osmo-ci[master]: contrib/obs-mirror: log to systemd journal
by osmith 10 Jul '26

10 Jul '26

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/42961?usp=email ) Change subject: contrib/obs-mirror: log to systemd journal ...................................................................... contrib/obs-mirror: log to systemd journal Instead of having a lot of logfiles in /home/pkgmirror and starting the obs-mirror scripts via cronjob, add systemd services and timers and let them log to the systemd journal. Change-Id: I3a567770ef6d98bb3fdc2d52214cacbfe59640ad --- D contrib/obs-mirror/README A contrib/obs-mirror/README.md M contrib/obs-mirror/obs-mirror.sh M contrib/obs-mirror/rm-old-nightly-archives.sh A contrib/obs-mirror/systemd/obs-mirror.service A contrib/obs-mirror/systemd/obs-mirror.timer A contrib/obs-mirror/systemd/rm-old-nightly-archives.service A contrib/obs-mirror/systemd/rm-old-nightly-archives.timer 8 files changed, 56 insertions(+), 13 deletions(-) Approvals: osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/contrib/obs-mirror/README b/contrib/obs-mirror/README deleted file mode 100644 index 4cab14b..0000000 --- a/contrib/obs-mirror/README +++ /dev/null @@ -1,7 +0,0 @@ -The scripts in this directory are used to create an archive of Osmocom related -packages from OBS, at: https://downloads.osmocom.org/obs-mirror/ - -There is no mechanism in place to deploy updated scripts after updating them -here in osmo-ci.git, so this must be done manually. - -See OS#4862 for more information. diff --git a/contrib/obs-mirror/README.md b/contrib/obs-mirror/README.md new file mode 100644 index 0000000..01c9615 --- /dev/null +++ b/contrib/obs-mirror/README.md @@ -0,0 +1,19 @@ +The scripts in this directory are used to create an archive of Osmocom related +packages from OBS, at: https://downloads.osmocom.org/obs-mirror/ + +There is no mechanism in place to deploy updated scripts after updating them +here in osmo-ci.git, so this must be done manually: + +``` +$ ssh pkgmirror(a)package-archive.osmocom.org +pkgmirror@package-archive:~$ git -C osmo-ci pull +``` + +After changing the systemd services or timers, deploy them as follows: +``` +$ scp systemd/* root@package-archive.osmocom.org:/etc/systemd/system +$ ssh root@@package-archive.osmocom.org +root@package-archive:~# systemctl daemon-reload +``` + +See OS#4862 for more information. diff --git a/contrib/obs-mirror/obs-mirror.sh b/contrib/obs-mirror/obs-mirror.sh index 85336ab..090ff26 100755 --- a/contrib/obs-mirror/obs-mirror.sh +++ b/contrib/obs-mirror/obs-mirror.sh @@ -9,10 +9,7 @@ # # See also: OS#4862 -DATE=`date +%Y%m%d-%H%M%S` -LOGFILE="/home/pkgmirror/obs-mirror-$DATE.log" -echo "Redirecting all output to: $LOGFILE" -exec >$LOGFILE 2>&1 +DATE="$(date +%Y%m%d-%H%M%S)" set -e -x SCRIPT_DIR="$(realpath "$(dirname "$(realpath "$0")")")" diff --git a/contrib/obs-mirror/rm-old-nightly-archives.sh b/contrib/obs-mirror/rm-old-nightly-archives.sh index 485788f..cde4223 100755 --- a/contrib/obs-mirror/rm-old-nightly-archives.sh +++ b/contrib/obs-mirror/rm-old-nightly-archives.sh @@ -1,7 +1,5 @@ #!/bin/sh -e # Remove nightly archives older than one month (OS#4862) -echo "Redirecting all output to: /home/pkgmirror/rm-old-nightly-archives.log" -exec >"/home/pkgmirror/rm-old-nightly-archives.log" 2>&1 DRY=0 diff --git a/contrib/obs-mirror/systemd/obs-mirror.service b/contrib/obs-mirror/systemd/obs-mirror.service new file mode 100644 index 0000000..6a2f8a0 --- /dev/null +++ b/contrib/obs-mirror/systemd/obs-mirror.service @@ -0,0 +1,10 @@ +[Unit] +Description=obs-mirror + +[Service] +Type=oneshot +User=pkgmirror +ExecStart=/home/pkgmirror/osmo-ci/contrib/obs-mirror/obs-mirror.sh + +[Install] +WantedBy=multi-user.target diff --git a/contrib/obs-mirror/systemd/obs-mirror.timer b/contrib/obs-mirror/systemd/obs-mirror.timer new file mode 100644 index 0000000..5005e2f --- /dev/null +++ b/contrib/obs-mirror/systemd/obs-mirror.timer @@ -0,0 +1,8 @@ +[Unit] +Description=Run obs-mirror.service + +[Timer] +OnCalendar=*-*-* 06:19:00 + +[Install] +WantedBy=timers.target diff --git a/contrib/obs-mirror/systemd/rm-old-nightly-archives.service b/contrib/obs-mirror/systemd/rm-old-nightly-archives.service new file mode 100644 index 0000000..6955f65 --- /dev/null +++ b/contrib/obs-mirror/systemd/rm-old-nightly-archives.service @@ -0,0 +1,10 @@ +[Unit] +Description=rm-old-nightly-archives + +[Service] +Type=oneshot +User=pkgmirror +ExecStart=/home/pkgmirror/osmo-ci/contrib/obs-mirror/rm-old-nightly-archives.sh + +[Install] +WantedBy=multi-user.target diff --git a/contrib/obs-mirror/systemd/rm-old-nightly-archives.timer b/contrib/obs-mirror/systemd/rm-old-nightly-archives.timer new file mode 100644 index 0000000..58e8266 --- /dev/null +++ b/contrib/obs-mirror/systemd/rm-old-nightly-archives.timer @@ -0,0 +1,8 @@ +[Unit] +Description=Run rm-old-nightly-archives.service + +[Timer] +OnCalendar=*-*-* 07:10:00 + +[Install] +WantedBy=timers.target -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/42961?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3a567770ef6d98bb3fdc2d52214cacbfe59640ad Gerrit-Change-Number: 42961 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in osmo-ci[master]: contrib/obs-mirror: log to systemd journal
by osmith 10 Jul '26

10 Jul '26

Attention is currently required from: jolly. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/42961?usp=email ) Change subject: contrib/obs-mirror: log to systemd journal ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/42961?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3a567770ef6d98bb3fdc2d52214cacbfe59640ad Gerrit-Change-Number: 42961 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Fri, 10 Jul 2026 11:37:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ci[master]: contrib/obs-mirror: log to systemd journal
by daniel 10 Jul '26

10 Jul '26

Attention is currently required from: jolly, osmith. daniel has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/42961?usp=email ) Change subject: contrib/obs-mirror: log to systemd journal ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/42961?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3a567770ef6d98bb3fdc2d52214cacbfe59640ad Gerrit-Change-Number: 42961 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Fri, 10 Jul 2026 11:36:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-dev[master]: Add 'onomono-eim' project
by osmith 10 Jul '26

10 Jul '26

Attention is currently required from: dexter, jolly. osmith has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmo-dev/+/42973?usp=email ) Change subject: Add 'onomono-eim' project ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/42973?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I47bfc02397b6f97ad891fe4816763ba634df7934 Gerrit-Change-Number: 42973 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 Jul 2026 10:57:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in onomondo-eim[master]: Add Makefile and start script for installation
by osmith 10 Jul '26

10 Jul '26

Attention is currently required from: dexter, jolly. osmith has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/onomondo-eim/+/42972?usp=email ) Change subject: Add Makefile and start script for installation ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/onomondo-eim/+/42972?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: onomondo-eim Gerrit-Branch: master Gerrit-Change-Id: I4f038c0901c23cbe18ef62eb546e264d0b924cc7 Gerrit-Change-Number: 42972 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 Jul 2026 10:57:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-dev[master]: Add 'onomono-eim' project
by jolly 10 Jul '26

10 Jul '26

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/42973?usp=email ) Change subject: Add 'onomono-eim' project ...................................................................... Add 'onomono-eim' project Related: SYS#8100 Change-Id: I47bfc02397b6f97ad891fe4816763ba634df7934 --- M all.buildsystems M all.deps 2 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/73/42973/1 diff --git a/all.buildsystems b/all.buildsystems index 63eab23..9b27105 100644 --- a/all.buildsystems +++ b/all.buildsystems @@ -4,6 +4,7 @@ osmo-s1gw erlang osmo-epdg erlang osmo_dia2gsup erlang +onomondo-eim erlang comp128-python python gsm0338 python diff --git a/all.deps b/all.deps index f5148ca..8377998 100644 --- a/all.deps +++ b/all.deps @@ -44,6 +44,8 @@ open5gs +onomondo-eim + # can only clone these docker-playground osmo-ttcn3-hacks -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/42973?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I47bfc02397b6f97ad891fe4816763ba634df7934 Gerrit-Change-Number: 42973 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>

1 0

[M] Change in onomondo-eim[master]: Add Makefile and start script for installation
by jolly 10 Jul '26

10 Jul '26

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/onomondo-eim/+/42972?usp=email ) Change subject: Add Makefile and start script for installation ...................................................................... Add Makefile and start script for installation The Makefile allows to compile and install onomondo-eim. This allows to build it with osmo-dev and therefore build and run it with testenv of osmo-ttcn3-hacks. The start script allows to run onomondo-eim without starting erlang by hand. It was taken from osmo-s1gw repository and log-level option was added. The program name changed from 'onomondo_eim_release' to 'onomodo-eim'. Related: SYS#8100 Change-Id: I4f038c0901c23cbe18ef62eb546e264d0b924cc7 --- A Makefile A contrib/onomondo-eim.sh M rebar.config 3 files changed, 143 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/onomondo-eim refs/changes/72/42972/1 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..9ca1dee --- /dev/null +++ b/Makefile @@ -0,0 +1,35 @@ +# where rebar3 stores build output +REBAR_BASE_DIR ?= _build +# config file used by 'run' and 'shell' +CONFIG ?= config/sys.config +# directory paths for 'install' +BINDIR ?= /usr/bin +LIBDIR ?= /usr/lib +CONFDIR ?= /etc/osmocom + +all: build + +GEN_FILES = src/* + +build: $(GEN_FILES) + rebar3 compile + +release: $(GEN_FILES) + rebar3 release + +run: shell + +shell: build + rebar3 shell --config $(CONFIG) + +install: release + install -d $(DESTDIR)$(LIBDIR) + cp -r $(REBAR_BASE_DIR)/default/rel/onomondo-eim $(DESTDIR)$(LIBDIR)/ + install -Dm0755 contrib/onomondo-eim.sh \ + $(DESTDIR)$(BINDIR)/onomondo-eim + install -Dm0644 config/sys.config \ + $(DESTDIR)$(CONFDIR)/onomondo-eim.config + +clean: + rebar3 clean + rm -rf $(REBAR_BASE_DIR) diff --git a/contrib/onomondo-eim.sh b/contrib/onomondo-eim.sh new file mode 100755 index 0000000..3252610 --- /dev/null +++ b/contrib/onomondo-eim.sh @@ -0,0 +1,107 @@ +#!/bin/sh -e + +# Simple boot script for Erlang/OTP releases that can be used in systemd unit files. +# +# Copyright 2025 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +# Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> +# +# SPDX-License-Identifier: MPL-2.0 +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +APP_NAME=onomondo-eim + +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" +LOG_LEVEL="notice" + +print_usage() { + echo "Usage: $0 [-s] [-r ROOTDIR] [-c CONFIG] [-C COOKIE] [-n NAME@HOST] [-l LOG_LEVEL]" +} + +print_help() { + echo " -h This message" + echo " -s Enable interactive shell" + echo " -r Application's root directory (default: ${ROOTDIR})" + echo " -c Config file path (default: ${CONFIG})" + echo " -C Erlang node cookie (default: ${COOKIE})" + echo " -n Erlang node name (default: ${NODE_NAME})" + echo " -l Logger level (default: ${LOG_LEVEL})" +} + +# Parse command line options, if any +while getopts "c:C:hn:r:sl:" opt; do + case "$opt" in + c) + CONFIG="$OPTARG" + ;; + C) + COOKIE="$OPTARG" + ;; + n) + NODE_NAME="$OPTARG" + ;; + r) + ROOTDIR=$(realpath "$OPTARG") + ;; + s) + ERL_SHELL="-shell" + ;; + l) + LOG_LEVEL="$OPTARG" + ;; + h) + print_usage + print_help + exit 1 + ;; + *) + print_usage + exit 1 + ;; + esac +done + +# Make sure that the application's root directory exists +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 + +# Determine the ERTS directory path (if not set) +if [ -z "${ERTS_DIR}" ]; then + # Parse the ERTS version from rebar3-generated bootstrap script + ERTS_VSN=$(grep "^ERTS_VSN=" ${ROOTDIR}/bin/${APP_NAME} | cut -d'"' -f2) + ERTS_DIR=${ERTS_DIR:-"${ROOTDIR}/erts-${ERTS_VSN}"} +fi + +# Determine the release directory path (if not set) +if [ -z "${REL_DIR}" ]; then + # Parse the release version from rebar3-generated bootstrap script + REL_VSN=$(grep "^REL_VSN=" ${ROOTDIR}/bin/${APP_NAME} | cut -d'"' -f2) + REL_DIR="${ROOTDIR}/releases/${REL_VSN}" +fi + +# Determine the boot script name +[ -f "${REL_DIR}/${APP_NAME}.boot" ] && BOOTFILE="${APP_NAME}" || BOOTFILE=start + +# erlexec requires BINDIR to be set +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 \ + -kernel logger_level "${LOG_LEVEL}" \ + ${ERL_SHELL} + +# vim:set ts=2 sw=2 et: diff --git a/rebar.config b/rebar.config index 43b3505..1380062 100644 --- a/rebar.config +++ b/rebar.config @@ -30,7 +30,7 @@ ]}. {relx, [ - {release, {onomondo_eim_release, {git, short}}, [onomondo_eim, sasl, runtime_tools]}, + {release, {'onomondo-eim', {git, short}}, [onomondo_eim, sasl, runtime_tools]}, {dev_mode, false}, {include_erts, true}, {include_src, false}, -- To view, visit https://gerrit.osmocom.org/c/onomondo-eim/+/42972?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: onomondo-eim Gerrit-Branch: master Gerrit-Change-Id: I4f038c0901c23cbe18ef62eb546e264d0b924cc7 Gerrit-Change-Number: 42972 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>

1 0

[S] Change in osmo-dev[master]: Support building onomondo-eim
by osmith 10 Jul '26

10 Jul '26

osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/42971?usp=email ) Change subject: Support building onomondo-eim ...................................................................... Abandoned Andreas has an alternative patch that adds a Makefile -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/42971?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I551e0b88110ed20fdbc301035fc3dac6e0d83635 Gerrit-Change-Number: 42971 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu>

1 0

[S] Change in osmo-dev[master]: Support building onomondo-eim
by osmith 10 Jul '26

10 Jul '26

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/42971?usp=email ) Change subject: Support building onomondo-eim ...................................................................... Support building onomondo-eim The onomondo-eim project is an erlang project, but it does not have a Makefile like the others. Run rebar3 directly in that case. I've also considered always doing this instead of running the Makefile, but that would break osmo-s1gw, which needs to run "rebar3 asn compile" before "rebar3 compile" as its Makefile does it. Change-Id: I551e0b88110ed20fdbc301035fc3dac6e0d83635 --- M all.buildsystems M all.deps M gen_makefile.py 3 files changed, 15 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/71/42971/1 diff --git a/all.buildsystems b/all.buildsystems index 63eab23..d851f3b 100644 --- a/all.buildsystems +++ b/all.buildsystems @@ -10,3 +10,5 @@ pyosmocom python pysctp python pyhss python + +onomondo-eim erlang diff --git a/all.deps b/all.deps index f5148ca..dab8565 100644 --- a/all.deps +++ b/all.deps @@ -68,3 +68,5 @@ pyosmocom gsm0338 pysctp pyhss comp128-python pyosmocom pysctp + +onomondo-eim diff --git a/gen_makefile.py b/gen_makefile.py index 4ee5290..e573f1c 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -420,13 +420,21 @@ touch $@ ''' elif buildsystem == "erlang": + check_cmd = "rebar3 eunit" if args.make_check else "true" return f''' .make.{proj}.build: .make.{proj}.configure $({proj}_files) @echo "\\n\\n\\n===== $@\\n" set -x && \\ export REBAR_BASE_DIR="$$PWD/{build_proj}" && \\ mkdir -p "$$REBAR_BASE_DIR" && \\ - $(MAKE) -C {src_proj} build {check} + cd {shlex.quote(src_proj)} && \\ + if [ -e Makefile ]; then \\ + $(MAKE) build {check}; \\ + else \\ + rebar3 compile && \\ + rebar3 escriptize && \\ + {check_cmd}; \\ + fi; sync touch $@ ''' @@ -471,13 +479,12 @@ ''' elif buildsystem == "erlang": # Use the "install" target if it exists, otherwise fall back to installing - # files generated by escriptize in default/bin. The fallback method can be - # removed once osmo-epdg has an install target. + # files generated by escriptize in default/bin. return f''' .make.{proj}.install: .make.{proj}.build @echo "\\n\\n\\n===== $@\\n" set -ex; \\ - if grep -q "^install:" {shlex.quote(src_proj)}/Makefile; then \\ + if grep -q "^install:" {shlex.quote(src_proj)}/Makefile 2>/dev/null; then \\ {sudo_make_install}$(MAKE) \\ -C {shlex.quote(src_proj)} \\ install \\ -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/42971?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I551e0b88110ed20fdbc301035fc3dac6e0d83635 Gerrit-Change-Number: 42971 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log July 2026