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

[XS] Change in osmo-ci[master]: jobs/master-builds: add osmo-rp2040-firmware

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40230?usp=email ) Change subject: jobs/master-builds: add osmo-rp2040-firmware ...................................................................... jobs/master-builds: add osmo-rp2040-firmware Related: OS#6784 Change-Id: I94a6135fa48d47fe92007d570670f6f5403ce11b --- M jobs/master-builds.yml 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/30/40230/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 71ad3ac..4b34eb2 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -80,6 +80,7 @@ docker_img_erlang: '$USER/debian-bookworm-erlang' docker_img_android: 'registry.osmocom.org/osmocom-build/debian-bookworm-android' docker_img_aram_applet: 'registry.osmocom.org/osmocom-build/debian-bookworm-aram-applet' + docker_img_rp2040: 'registry.osmocom.org/osmocom-build/debian-bookworm-rp2040' timeout_cmd: '/usr/bin/timeout 30m' cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh' trigger: @@ -541,6 +542,14 @@ ssh: - binaries_ftp.osmocom.org - docs_ftp.osmocom.org + - osmo-rp2040-firmware: + cmd: | + docker pull {docker_img_rp2040} + {docker_run} \ + {docker_img_rp2040} {timeout_cmd} contrib/jenkins.sh + email: jenkins-notifications(a)lists.osmocom.org + ssh: + - binaries_ftp.osmocom.org - simtrace: repos_url: '{gitea_url}/sim-card/{repos}' email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40230?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I94a6135fa48d47fe92007d570670f6f5403ce11b Gerrit-Change-Number: 40230 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/master: pass osmo-ci to docker

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40229?usp=email ) Change subject: jobs/master: pass osmo-ci to docker ...................................................................... jobs/master: pass osmo-ci to docker Let jobs such as the upcoming one for osmo-rp2040-firmware use the known_hosts file from osmo-ci when uploading binaries. In other jobs we've copied the known_hosts into the contrib/jenkins.sh file, but let's try to have it in a central place at least for new jobs. Related: OS#6784 Change-Id: If5257e7f5e3e2f9e09c52fa558a63e34c276b9a6 --- M jobs/master-builds.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/29/40229/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 720c159..71ad3ac 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -42,6 +42,7 @@ -i \ -u build \ -v $(readlink -f $SSH_AUTH_SOCK):/ssh-agent \ + -v "$HOME/osmo-ci:/osmo-ci:ro" \ -v "$PWD:/build" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ docker_run_ccache: | @@ -68,6 +69,7 @@ -i \ -u build \ -v $(readlink -f $SSH_AUTH_SOCK):/ssh-agent \ + -v "$HOME/osmo-ci:/osmo-ci:ro" \ -v "$PWD:/build" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40229?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If5257e7f5e3e2f9e09c52fa558a63e34c276b9a6 Gerrit-Change-Number: 40229 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-rp2040-firmware[master]: contrib/jenkins: publish binaries

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-rp2040-firmware/+/40228?usp=email ) Change subject: contrib/jenkins: publish binaries ...................................................................... contrib/jenkins: publish binaries Publish binaries to: https://ftp.osmocom.org/binaries/osmo-rp2040-firmware/ Related: OS#6784 Change-Id: Ic22d693bfebc33278033514fa5900866454e499f --- M contrib/jenkins.sh 1 file changed, 56 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-rp2040-firmware refs/changes/28/40228/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 7f72e1b..7049ea6 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -3,6 +3,10 @@ iso7816_cardem osmo-gtm900 " +PUBLISH_EXT=" + elf + uf2 +" rm -rf build mkdir build @@ -16,3 +20,55 @@ make -j$(nproc) "$i" done + +if [ "$PUBLISH" = 1 ]; then + echo + echo "=== publishing binaries ===" + echo + + VERSION="$(git describe HEAD)" + SSH_COMMAND="ssh -o 'UserKnownHostsFile=/osmo-ci/contrib/known_hosts' -p 48" + UPLOAD_PATH="binaries@ftp.osmocom.org:web-files/osmo-rp2040-firmware" + EXISTING_BINARIES="$(rsync \ + --rsh "$SSH_COMMAND" \ + "$UPLOAD_PATH"/all/)" + + if [ -z "$VERSION" ]; then + echo "ERROR: failed to get version from 'git describe HEAD'" + exit 1 + fi + + for target in $TARGETS; do + for ext in $PUBLISH_EXT; do + BIN_PATH="$(find -name "$target.$ext")" + if [ -z "$BIN_PATH" ]; then + echo "ERROR: failed to find $target.$ext" + exit 1 + fi + + BIN_LATEST="$target-$VERSION.$ext" + if echo "$EXISTING_BINARIES" | grep -q "$BIN_LATEST"; then + echo "$BIN_LATEST: exists on server, skipping" + continue + fi + + echo "$BIN_LATEST: uploading $BIN_PATH" + + rsync \ + --rsh "$SSH_COMMAND" \ + -a \ + "$BIN_PATH" \ + "$UPLOAD_PATH"/latest/"$target.$ext" + + rsync \ + --rsh "$SSH_COMMAND" \ + -a \ + "$BIN_PATH" \ + "$UPLOAD_PATH"/all/"$BIN_LATEST" + done + done +fi + +echo +echo "=== success ===" +echo -- To view, visit https://gerrit.osmocom.org/c/osmo-rp2040-firmware/+/40228?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-rp2040-firmware Gerrit-Branch: master Gerrit-Change-Id: Ic22d693bfebc33278033514fa5900866454e499f Gerrit-Change-Number: 40228 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-rp2040-firmware[master]: contrib/jenkins: iterate over list of targets

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-rp2040-firmware/+/40227?usp=email ) Change subject: contrib/jenkins: iterate over list of targets ...................................................................... contrib/jenkins: iterate over list of targets Prepare to add code to upload each target's binary in the next patch. Remove "set -x" to make the output more readable (the shell code is simple, no need to be that verbose about it here). Related: OS#6784 Change-Id: Ic106e298a1e6a4aa01e2c1d87b1d806f90f27b73 --- M CMakeLists.txt M contrib/jenkins.sh 2 files changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-rp2040-firmware refs/changes/27/40227/1 diff --git a/CMakeLists.txt b/CMakeLists.txt index cb0f06f..94a9b6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,5 +17,6 @@ -Wno-maybe-uninitialized ) +# When adding new subdirs, make sure to adjust TARGETS in contrib/jenkins.sh! add_subdirectory(iso7816) add_subdirectory(osmo-gtm900) diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index e24d71a..7f72e1b 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,7 +1,18 @@ -#!/bin/sh -ex +#!/bin/sh -e +TARGETS=" + iso7816_cardem + osmo-gtm900 +" rm -rf build mkdir build cd build cmake .. -make -j$(nproc) + +for i in $TARGETS; do + echo + echo "=== make $i ===" + echo + + make -j$(nproc) "$i" +done -- To view, visit https://gerrit.osmocom.org/c/osmo-rp2040-firmware/+/40227?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-rp2040-firmware Gerrit-Branch: master Gerrit-Change-Id: Ic106e298a1e6a4aa01e2c1d87b1d806f90f27b73 Gerrit-Change-Number: 40227 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XS] Change in osmo-rp2040-firmware[master]: contrib/jenkins: remove previous build dir

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-rp2040-firmware/+/40226?usp=email ) Change subject: contrib/jenkins: remove previous build dir ...................................................................... contrib/jenkins: remove previous build dir Change-Id: I13ed287fc3d5710cf0a9b6abe0d5f8b89402160b --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-rp2040-firmware refs/changes/26/40226/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 702eea3..e24d71a 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,6 @@ #!/bin/sh -ex +rm -rf build mkdir build cd build cmake .. -- To view, visit https://gerrit.osmocom.org/c/osmo-rp2040-firmware/+/40226?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-rp2040-firmware Gerrit-Branch: master Gerrit-Change-Id: I13ed287fc3d5710cf0a9b6abe0d5f8b89402160b Gerrit-Change-Number: 40226 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XS] Change in docker-playground[master]: debian-bookworm-rp2040: add openssh-client, rsync

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/40225?usp=email ) Change subject: debian-bookworm-rp2040: add openssh-client, rsync ...................................................................... debian-bookworm-rp2040: add openssh-client, rsync Add packages required for publishing binaries. Related: OS#6784 Change-Id: Ie82eff2de77cbe2770b677439f6942f515572f06 --- M debian-bookworm-rp2040/Dockerfile 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/25/40225/1 diff --git a/debian-bookworm-rp2040/Dockerfile b/debian-bookworm-rp2040/Dockerfile index 4741811..6c9d480 100644 --- a/debian-bookworm-rp2040/Dockerfile +++ b/debian-bookworm-rp2040/Dockerfile @@ -28,8 +28,10 @@ libnewlib-arm-none-eabi \ libstdc++-arm-none-eabi-newlib \ libusb-1.0-0-dev \ + openssh-client \ pkg-config \ python3 \ + rsync \ && \ apt-get clean -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40225?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie82eff2de77cbe2770b677439f6942f515572f06 Gerrit-Change-Number: 40225 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: meas_json: add command line option to specify binding ip

by iedemam

Attention is currently required from: iedemam. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/40224?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: meas_json: add command line option to specify binding ip ...................................................................... meas_json: add command line option to specify binding ip Change-Id: I3baa80c95b373e3f9483a2778bd195ff99bbdec0 --- M src/utils/meas_json.c 1 file changed, 71 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/24/40224/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/40224?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3baa80c95b373e3f9483a2778bd195ff99bbdec0 Gerrit-Change-Number: 40224 Gerrit-PatchSet: 2 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: iedemam <michael(a)kapsulate.com>

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: meas_json: add command line option to specify binding ip

by Jenkins Builder

Jenkins Builder has posted comments on this change by iedemam. ( https://gerrit.osmocom.org/c/osmo-bsc/+/40224?usp=email ) Change subject: meas_json: add command line option to specify binding ip ...................................................................... Patch Set 1: (1 comment) File src/utils/meas_json.c: Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-bsc/+/40224/comment/98c8b3e4_ec0701ba?usp… : PS1, Line 191: static void handle_options(int argc, char** argv) "foo** bar" should be "foo **bar" -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/40224?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3baa80c95b373e3f9483a2778bd195ff99bbdec0 Gerrit-Change-Number: 40224 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 06 May 2025 10:10:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: meas_json: add command line option to specify binding ip

by iedemam

iedemam has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/40224?usp=email ) Change subject: meas_json: add command line option to specify binding ip ...................................................................... meas_json: add command line option to specify binding ip Change-Id: I3baa80c95b373e3f9483a2778bd195ff99bbdec0 --- M src/utils/meas_json.c 1 file changed, 71 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/24/40224/1 diff --git a/src/utils/meas_json.c b/src/utils/meas_json.c index 953b114..7184a4d 100644 --- a/src/utils/meas_json.c +++ b/src/utils/meas_json.c @@ -31,6 +31,8 @@ #include <netinet/in.h> +#include <getopt.h> + #include <osmocom/core/socket.h> #include <osmocom/core/msgb.h> #include <osmocom/core/select.h> @@ -41,6 +43,9 @@ #include <osmocom/bsc/gsm_data.h> #include <osmocom/bsc/meas_feed.h> +/* binding IP */ +static char *bind_ip = NULL; + static void print_meas_rep_uni_json(struct gsm_meas_rep_unidir *mru) { printf("\"RXL-FULL\":%d, \"RXL-SUB\":%d, ", @@ -172,6 +177,68 @@ return 0; } +static void print_help(void) +{ + printf(" -h --help. This help text.\n"); + printf(" -b --bind-ip. The IP to bind to.\n"); +} + +static void print_usage(void) +{ + printf("Usage: meas_json [options]\n"); +} + +static void handle_options(int argc, char** argv) +{ + int options_mask = 0; + + /* disable explicit missing arguments error output from getopt_long */ + opterr = 0; + + while (1) { + int option_index = 0, c; + static struct option long_options[] = { + {"help", 0, 0, 'h'}, + {"bind-ip", 0, 0, 'b'}, + {0, 0, 0, 0} + }; + + c = getopt_long(argc, argv, "hb:", + long_options, &option_index); + if (c == -1) + break; + + switch (c) { + case 'h': + print_usage(); + print_help(); + exit(0); + case 'b': + bind_ip = optarg; + break; + case '?': + if (optopt) { + printf("ERROR: missing mandatory argument " + "for `%s' option\n", argv[optind-1]); + } else { + printf("ERROR: unknown option `%s'\n", + argv[optind-1]); + } + print_usage(); + print_help(); + exit(EXIT_FAILURE); + break; + default: + /* ignore */ + break; + } + } + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } +} + /* default categories */ static struct log_info_cat default_categories[] = { }; @@ -187,11 +254,14 @@ void *tall_ctx = talloc_named_const(NULL, 0, "meas_json"); osmo_init_logging2(tall_ctx, &meas_json_log_info); + bind_ip = NULL; + handle_options(argc, argv); + int rc; struct osmo_fd udp_ofd; udp_ofd.cb = udp_fd_cb; - rc = osmo_sock_init_ofd(&udp_ofd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, NULL, 8888, OSMO_SOCK_F_BIND); + rc = osmo_sock_init_ofd(&udp_ofd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, bind_ip, 8888, OSMO_SOCK_F_BIND); if (rc < 0) exit(1); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/40224?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3baa80c95b373e3f9483a2778bd195ff99bbdec0 Gerrit-Change-Number: 40224 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com>

1 month, 2 weeks

1
0
0 0

[S] Change in libosmocore[rel-1.11.1]: Bump version: 1.11.0.3-5e10c → 1.11.1

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/40223?usp=email ) Change subject: Bump version: 1.11.0.3-5e10c → 1.11.1 ...................................................................... Bump version: 1.11.0.3-5e10c → 1.11.1 Change-Id: If22e810464a33bcadbd03462b4a84bc303377fae --- M debian/changelog M src/gsm/Makefile.am M src/isdn/Makefile.am 3 files changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/23/40223/1 diff --git a/debian/changelog b/debian/changelog index 9da8106..c3e7931 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libosmocore (1.11.1) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * tests: soft_uart: Fix printf int type format + * lapd: Take talloc msgb ownership when enqueueing it + * lapdm: Take talloc msgb ownership when enqueueing it + + -- Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> Tue, 06 May 2025 16:24:20 +0700 + libosmocore (1.11.0) unstable; urgency=medium [ Mychaela N. Falconia ] diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index b9900e2..e732c7e 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=22:0:2 +LIBVERSION=22:1:2 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) diff --git a/src/isdn/Makefile.am b/src/isdn/Makefile.am index 5145545..40320c3 100644 --- a/src/isdn/Makefile.am +++ b/src/isdn/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=2:0:2 +LIBVERSION=2:1:2 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40223?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: rel-1.11.1 Gerrit-Change-Id: If22e810464a33bcadbd03462b4a84bc303377fae Gerrit-Change-Number: 40223 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025