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

[XS] Change in simtrace2[master]: firmware: card_emu.h: declare usb_buf_upd_len_and_submit()
by laforge 15 Jul '26

15 Jul '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/43002?usp=email ) Change subject: firmware: card_emu.h: declare usb_buf_upd_len_and_submit() ...................................................................... firmware: card_emu.h: declare usb_buf_upd_len_and_submit() usb_buf_upd_len_and_submit() is already a non-static function and should be accessible. Change-Id: I734d4b2d782223dd2f735f140d8c9bc6fc00a086 --- M firmware/libcommon/include/card_emu.h 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/include/card_emu.h b/firmware/libcommon/include/card_emu.h index 8b571bb..c2d3b68 100644 --- a/firmware/libcommon/include/card_emu.h +++ b/firmware/libcommon/include/card_emu.h @@ -19,6 +19,7 @@ #include <stdint.h> struct card_handle; +struct msgb; enum card_io { CARD_IO_VCC, @@ -75,3 +76,5 @@ struct cardemu_usb_msg_config; int card_emu_set_config(struct card_handle *ch, const struct cardemu_usb_msg_config *scfg, unsigned int scfg_len); + +void usb_buf_upd_len_and_submit(struct msgb *msg); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/43002?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I734d4b2d782223dd2f735f140d8c9bc6fc00a086 Gerrit-Change-Number: 43002 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in simtrace2[master]: README.md: fix typo in firmware
by laforge 15 Jul '26

15 Jul '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/42999?usp=email ) Change subject: README.md: fix typo in firmware ...................................................................... README.md: fix typo in firmware Change-Id: I16721418fce55322c8730920ceaa4e65f91a8a7e --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/README.md b/README.md index de86cb5..f258b40 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ * libosmo-simtrace2 - a shared library to talk to devices running the simtrace2 firmware * simtrace2-list - list any USB-attached devices running simtrace2 firmware * simtrace2-sniff - interface the 'trace' firmware to obtain card protocol traces -* simtrace2-cardem-pcsc - interface the 'cardem' fimrware to use a SIM in a PC/SC reader +* simtrace2-cardem-pcsc - interface the 'cardem' firmware to use a SIM in a PC/SC reader Do not expect SIMtrace2 to work in VMs -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/42999?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I16721418fce55322c8730920ceaa4e65f91a8a7e Gerrit-Change-Number: 42999 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in simtrace2[master]: README.md: describe the debug uart
by laforge 15 Jul '26

15 Jul '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/43000?usp=email ) Change subject: README.md: describe the debug uart ...................................................................... README.md: describe the debug uart Change-Id: I4cf929fded962e7ffb4c01628279385b2af04157 --- M README.md 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/README.md b/README.md index f258b40..168294f 100644 --- a/README.md +++ b/README.md @@ -52,3 +52,11 @@ calling for trouble** and we will not accept related bug reports or support you if you do. If you still want to use VMs: Feel free to do so, but understand that it's unsupported and you are on your own. + +Debug UART +---------- + +The debug UART configuration is 921600 8N1, TTL 3.3V. + +On the simtrace 2 use either a 2.5 mm stereo headphone connector (tip = TX, ring = RX, sleeve = GND) +or the nearby DEBUG port (pin 1 = GND, pin 4 = TX, pin 5 = RX). -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/43000?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I4cf929fded962e7ffb4c01628279385b2af04157 Gerrit-Change-Number: 43000 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in simtrace2[master]: firmware: card_emu.h: add missing header stdbool.h.
by laforge 15 Jul '26

15 Jul '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/43001?usp=email ) Change subject: firmware: card_emu.h: add missing header stdbool.h. ...................................................................... firmware: card_emu.h: add missing header stdbool.h. Change-Id: I4ad6d5cf0b4477cbd5f761d70c4cd92fb3ca1fcd --- M firmware/libcommon/include/card_emu.h 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/include/card_emu.h b/firmware/libcommon/include/card_emu.h index 2668d73..8b571bb 100644 --- a/firmware/libcommon/include/card_emu.h +++ b/firmware/libcommon/include/card_emu.h @@ -15,6 +15,7 @@ */ #pragma once +#include <stdbool.h> #include <stdint.h> struct card_handle; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/43001?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I4ad6d5cf0b4477cbd5f761d70c4cd92fb3ca1fcd Gerrit-Change-Number: 43001 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[S] Change in simtrace2[master]: firmware: Drop CEMU_TX_DATA when sim is in-active
by laforge 15 Jul '26

15 Jul '26

Attention is currently required from: lynxis lazus. laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/simtrace2/+/43003?usp=email ) Change subject: firmware: Drop CEMU_TX_DATA when sim is in-active ...................................................................... Patch Set 4: Code-Review+1 (2 comments) File firmware/libcommon/include/card_emu.h: https://gerrit.osmocom.org/c/simtrace2/+/43003/comment/6c5f50ed_becba710?us… : PS4, Line 75: bool card_ready(struct card_handle *ch); const struct File firmware/libcommon/source/card_emu.c: https://gerrit.osmocom.org/c/simtrace2/+/43003/comment/a15d6508_e5d06526?us… : PS4, Line 219: bool card_ready(struct card_handle *ch) const struct ... -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/43003?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I796e548225a742cddfde12bd6a60e4d2e5c04c8f Gerrit-Change-Number: 43003 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 15 Jul 2026 12:23:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[XS] Change in simtrace2[master]: firmware: card_emu.h: declare usb_buf_upd_len_and_submit()
by laforge 15 Jul '26

15 Jul '26

Attention is currently required from: lynxis lazus. laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/simtrace2/+/43002?usp=email ) Change subject: firmware: card_emu.h: declare usb_buf_upd_len_and_submit() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/43002?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I734d4b2d782223dd2f735f140d8c9bc6fc00a086 Gerrit-Change-Number: 43002 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 15 Jul 2026 12:22:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in simtrace2[master]: firmware: card_emu.h: add missing header stdbool.h.
by laforge 15 Jul '26

15 Jul '26

Attention is currently required from: lynxis lazus. laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/simtrace2/+/43001?usp=email ) Change subject: firmware: card_emu.h: add missing header stdbool.h. ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/43001?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I4ad6d5cf0b4477cbd5f761d70c4cd92fb3ca1fcd Gerrit-Change-Number: 43001 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 15 Jul 2026 12:21:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in simtrace2[master]: README.md: describe the debug uart
by laforge 15 Jul '26

15 Jul '26

Attention is currently required from: lynxis lazus. laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/simtrace2/+/43000?usp=email ) Change subject: README.md: describe the debug uart ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/43000?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I4cf929fded962e7ffb4c01628279385b2af04157 Gerrit-Change-Number: 43000 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 15 Jul 2026 12:21:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-hlr[master]: systemd: run db-upgrade script in ExecStartPre
by osmith 15 Jul '26

15 Jul '26

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/43010?usp=email ) Change subject: systemd: run db-upgrade script in ExecStartPre ...................................................................... systemd: run db-upgrade script in ExecStartPre We have seen in CI jobs that calling the DB upgrade script from debian/postinst does not work reliably. When doing a fresh install of osmo-hlr, it usually works as expected: Setting up osmo-hlr (1.9.2) ... osmo-hlr-post-upgrade: nothing to do (no existing database) But sometimes: Setting up osmo-hlr (1.9.2) ... osmo-hlr-post-upgrade: database upgrade is required osmo-hlr-post-upgrade: stopping osmo-hlr service osmo-hlr-post-upgrade: creating backup: /var/lib/osmocom/hlr.db.20260706135658.bak osmo-hlr-post-upgrade: performing database upgrade <0001> db.c:600 using database: /var/lib/osmocom/hlr.db <0001> db.c:103 (283) recovered 4 frames from WAL file /var/lib/osmocom/hlr.db-wal <0001> db.c:679 Database '/var/lib/osmocom/hlr.db' has HLR DB schema version 0 <0001> db.c:103 (1) duplicate column name: last_lu_seen in "ALTER TABLE subscriber ADD COLUMN last_lu_seen TIMESTAMP default NULL" <0001> db.c:248 Unable to prepare SQL statement 'ALTER TABLE subscriber ADD COLUMN last_lu_seen TIMESTAMP default NULL' <0001> db.c:318 Unable to update HLR database schema to version 1 <0001> db.c:685 Failed to upgrade HLR DB schema to version 1: (rc=1) duplicate column name: last_lu_seen <0000> hlr_db_tool.c:509 Error opening database It seems that osmo-hlr can get started before the osmo-hlr-post-upgrade script runs, then starts to create the database with the current schema, and gets stopped before it is done, leading to the failure above. Rename the script to osmo-hlr-db-upgrade.sh, remove logic for stopping and starting the service and let systemd call it in ExecStartPre. That way we are sure that it runs *before* osmo-hlr starts up. Related: SYS#8125 Change-Id: If13f4c8b49397e6630956e92a7825843c7d55ebd --- M contrib/Makefile.am R contrib/osmo-hlr-db-upgrade.sh M contrib/systemd/osmo-hlr.service M debian/osmo-hlr.install M debian/postinst 5 files changed, 8 insertions(+), 43 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 37c4aa4..fa3f1a2 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -3,12 +3,12 @@ dgsm \ $(NULL) -EXTRA_DIST = osmo-hlr-post-upgrade.sh +EXTRA_DIST = osmo-hlr-db-upgrade.sh install-data-hook: - install -Dm755 $(srcdir)/osmo-hlr-post-upgrade.sh \ + install -Dm755 $(srcdir)/osmo-hlr-db-upgrade.sh \ -t $(DESTDIR)$(datadir)/osmocom/ uninstall-hook: @$(PRE_UNINSTALL) - $(RM) $(DESTDIR)$(datadir)/osmocom/osmo-hlr-post-upgrade.sh + $(RM) $(DESTDIR)$(datadir)/osmocom/osmo-hlr-db-upgrade.sh diff --git a/contrib/osmo-hlr-post-upgrade.sh b/contrib/osmo-hlr-db-upgrade.sh similarity index 61% rename from contrib/osmo-hlr-post-upgrade.sh rename to contrib/osmo-hlr-db-upgrade.sh index eaef417..2f288af 100644 --- a/contrib/osmo-hlr-post-upgrade.sh +++ b/contrib/osmo-hlr-db-upgrade.sh @@ -2,14 +2,13 @@ # SPDX-License-Identifier: AGPL-3.0-or-later # Copyright 2021 sysmocom s.f.m.c GmbH <info(a)sysmocom.de> # -# Packagers are supposed to call this script in post-upgrade, so it can safely -# upgrade the database scheme if required. +# This script gets called in ExecStartPre= of osmo-hlr.service, so it can +# safely upgrade the database scheme if required. DB="/var/lib/osmocom/hlr.db" -IS_ACTIVE=0 msg() { - echo "osmo-hlr-post-upgrade: $@" + echo "osmo-hlr-db-upgrade: $@" } err() { @@ -36,27 +35,6 @@ msg "database upgrade is required" } -stop_service() { - if systemctl is-active -q osmo-hlr; then - IS_ACTIVE=1 - msg "stopping osmo-hlr service" - systemctl stop osmo-hlr - - # Verify that it stopped - for i in $(seq 1 100); do - if ! systemctl is-active -q osmo-hlr; then - return - fi - sleep 0.1 - done - - err "failed to stop osmo-hlr service" - exit 1 - else - msg "osmo-hlr service is not running" - fi -} - create_backup() { backup="$DB.$(date +%Y%m%d%H%M%S).bak" msg "creating backup: $backup" @@ -81,15 +59,6 @@ msg "database upgrade successful" } -start_service() { - if [ "$IS_ACTIVE" = "1" ]; then - msg "starting osmo-hlr service" - systemctl start osmo-hlr - fi -} - check_upgrade_required -stop_service create_backup upgrade -start_service diff --git a/contrib/systemd/osmo-hlr.service b/contrib/systemd/osmo-hlr.service index 2822f13..a28a989 100644 --- a/contrib/systemd/osmo-hlr.service +++ b/contrib/systemd/osmo-hlr.service @@ -11,6 +11,7 @@ WorkingDirectory=%S/osmocom User=osmocom Group=osmocom +ExecStartPre=/usr/share/osmocom/osmo-hlr-db-upgrade.sh ExecStart=/usr/bin/osmo-hlr -c /etc/osmocom/osmo-hlr.cfg -l /var/lib/osmocom/hlr.db RestartSec=2 ProtectHome=true diff --git a/debian/osmo-hlr.install b/debian/osmo-hlr.install index 7c8c398..bb13183 100644 --- a/debian/osmo-hlr.install +++ b/debian/osmo-hlr.install @@ -6,4 +6,4 @@ /usr/share/doc/osmo-hlr/sql/hlr_data.sql /usr/share/doc/osmo-hlr/examples/osmo-hlr.cfg /usr/share/doc/osmo-hlr/examples/osmo-hlr-dgsm.cfg -/usr/share/osmocom/osmo-hlr-post-upgrade.sh +/usr/share/osmocom/osmo-hlr-db-upgrade.sh diff --git a/debian/postinst b/debian/postinst index 34fb79d..327ba00 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,9 +1,4 @@ #!/bin/sh -e -# Debian's postinst script is called on both installation and upgrade. Call the -# post-upgrade script in both cases, it won't do anything if there is nothing -# to do. -/usr/share/osmocom/osmo-hlr-post-upgrade.sh - case "$1" in configure) # Create the osmocom group and user (if it doesn't exist yet) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/43010?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: If13f4c8b49397e6630956e92a7825843c7d55ebd Gerrit-Change-Number: 43010 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in osmo-hlr[master]: systemd: run db-upgrade script in ExecStartPre
by osmith 15 Jul '26

15 Jul '26

Attention is currently required from: dexter, jolly. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-hlr/+/43010?usp=email ) Change subject: systemd: run db-upgrade script in ExecStartPre ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/43010?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: If13f4c8b49397e6630956e92a7825843c7d55ebd Gerrit-Change-Number: 43010 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 Jul 2026 12:21:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log July 2026