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

[XS] Change in osmo-remsim[master]: src/bankd/bankd_pcsc: fix error on debian 13 i386

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/40870?usp=email ) Change subject: src/bankd/bankd_pcsc: fix error on debian 13 i386 ...................................................................... src/bankd/bankd_pcsc: fix error on debian 13 i386 Fix for: bankd_pcsc.c:316:98: error: passing argument 7 of 'SCardTransmit' from incompatible pointer type [-Wincompatible-pointer-types] 316 | rc = SCardTransmit(worker->reader.pcsc.hCard, pioSendPci, out, out_len, &pioRecvPci, in, in_len); | ^~~~~~ | | | size_t * {aka unsigned int *} In file included from bankd.h:11, from bankd_pcsc.c:28: /usr/include/PCSC/winscard.h:98:56: note: expected 'LPDWORD' {aka 'long unsigned int *'} but argument is of type 'size_t *' {aka 'unsigned int *'} Related: https://pcsclite.apdu.fr/api/group__API.html#ga9a2d77242a271310269065e64633… Related: OS#6828 Change-Id: I4978cd9b91920fe6049ccb398a8d6b93deaa4980 --- M src/bankd/bankd_pcsc.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/70/40870/1 diff --git a/src/bankd/bankd_pcsc.c b/src/bankd/bankd_pcsc.c index e1477dd..f9651f3 100644 --- a/src/bankd/bankd_pcsc.c +++ b/src/bankd/bankd_pcsc.c @@ -313,11 +313,15 @@ SCARD_IO_REQUEST pioRecvPci; long rc; - rc = SCardTransmit(worker->reader.pcsc.hCard, pioSendPci, out, out_len, &pioRecvPci, in, in_len); + /* DWORD can be different from size_t */ + DWORD in_len_d = *in_len; + + rc = SCardTransmit(worker->reader.pcsc.hCard, pioSendPci, out, out_len, &pioRecvPci, in, &in_len_d); /* don't use PCSC_ERROR here as we don't want to log every successful SCardTransmit */ if (rc != SCARD_S_SUCCESS) LOGW_PCSC_ERROR(worker, rc, "SCardTransmit"); + *in_len = in_len_d; return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/40870?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I4978cd9b91920fe6049ccb398a8d6b93deaa4980 Gerrit-Change-Number: 40870 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

4 weeks, 1 day

1
0
0 0

[XS] Change in osmo-remsim[master]: src/bankd/bankd_main: fix error on debian 13 i386

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/40869?usp=email ) Change subject: src/bankd/bankd_main: fix error on debian 13 i386 ...................................................................... src/bankd/bankd_main: fix error on debian 13 i386 Fix for: bankd_main.c:824:46: error: passing argument 5 of 'worker->ops->transceive' from incompatible pointer type [-Wincompatible-pointer-types] 824 | rx_buf, &rx_buf_len); | ^~~~~~~~~~~ | | | DWORD * {aka long unsigned int *} bankd_main.c:824:46: note: expected 'size_t *' {aka 'unsigned int *'} but argument is of type 'DWORD *' {aka 'long unsigned int *'} Related: OS#6828 Change-Id: I9f943a3448da5f23ea75c116559cf0b6ba6b23c7 --- M src/bankd/bankd_main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/69/40869/1 diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index fe11497..6e47376 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -792,7 +792,7 @@ { const struct TpduModemToCard *mdm2sim = &pdu->msg.choice.tpduModemToCard; uint8_t rx_buf[1024]; - DWORD rx_buf_len = sizeof(rx_buf); + size_t rx_buf_len = sizeof(rx_buf); RsproPDU_t *pdu_resp; struct client_slot clslot; struct bank_slot bslot; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/40869?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I9f943a3448da5f23ea75c116559cf0b6ba6b23c7 Gerrit-Change-Number: 40869 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

4 weeks, 1 day

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/registry-update-base-images: add debian:trixie

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40868?usp=email ) Change subject: jobs/registry-update-base-images: add debian:trixie ...................................................................... jobs/registry-update-base-images: add debian:trixie Change-Id: I905863157b35bdc4ca60116be477b90abbd215f1 --- M jobs/registry-update-base-images.yml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/68/40868/1 diff --git a/jobs/registry-update-base-images.yml b/jobs/registry-update-base-images.yml index c9934cb..889deb9 100644 --- a/jobs/registry-update-base-images.yml +++ b/jobs/registry-update-base-images.yml @@ -29,6 +29,7 @@ debian/eol:buster debian:bullseye debian:bookworm + debian:trixie debian:sid centos:centos7 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40868?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: I905863157b35bdc4ca60116be477b90abbd215f1 Gerrit-Change-Number: 40868 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-ci[master]: OBS: support building debian trixie (13) pkgs

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40859?usp=email ) Change subject: OBS: support building debian trixie (13) pkgs ...................................................................... OBS: support building debian trixie (13) pkgs Translate "debian:13" to "debian:trixie", as for some reason no docker tag is getting pushed for "debian:13". With this we can keep using the usual short naming scheme in pipeline_binpkgs lines in gerrit-verifications.yml (see next patch). Change-Id: I1377af7f74f074ed6e28e07dee82360d024edd05 --- M scripts/obs/lib/docker.py 1 file changed, 10 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/scripts/obs/lib/docker.py b/scripts/obs/lib/docker.py index a68c7f9..68ed28d 100644 --- a/scripts/obs/lib/docker.py +++ b/scripts/obs/lib/docker.py @@ -19,8 +19,16 @@ if image_type.endswith("_manuals"): return get_image_name(distro, image_type.replace("_manuals", "")) - if distro == "debian:10": - distro = "debian/eol:buster" + # Ensure we can use short names like "debian:13" instead of "debian:trixie" + # even though upstream apparently doesn't push the number-tags anymore: + # https://hub.docker.com/_/debian + match distro: + case "debian:10": + distro = "debian/eol:buster" + # debian:11 points to debian:bullseye upstream + # debian:12 points to debian:bookworm upstream + case "debian:13": + distro = "debian:trixie" return distro -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40859?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: I1377af7f74f074ed6e28e07dee82360d024edd05 Gerrit-Change-Number: 40859 Gerrit-PatchSet: 1 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: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

4 weeks, 1 day

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/gerrit: remove binpkgs that are the default

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40860?usp=email ) Change subject: jobs/gerrit: remove binpkgs that are the default ...................................................................... jobs/gerrit: remove binpkgs that are the default Remove the pipeline_binpkgs lines that are the same as the default. This is in preparation for changing the default. Change-Id: I348a83c8d70c2042bcab9ccaf83be2a638e722e7 --- M jobs/gerrit-verifications.yml 1 file changed, 2 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 3d70e47..1a722d7 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -135,8 +135,7 @@ pipeline_binpkgs: "" pipeline_lint: false - - cellmgr-ng: - pipeline_binpkgs: "debian:10 debian:12" + - cellmgr-ng - docker-playground: pipeline_build: false @@ -283,8 +282,7 @@ -e WITH_MANUALS="$WITH_MANUALS" \ {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - - osmo-gsm-manuals: - pipeline_binpkgs: "debian:10 debian:12" + - osmo-gsm-manuals - osmo_gsup: repos_url: '{gerrit_url}/erlang/{repos}' @@ -349,7 +347,6 @@ - osmo-python-tests: repos_url: '{gerrit_url}/python/{repos}' gerrit_project: 'python/{repos}' - pipeline_binpkgs: "debian:10 debian:12" - pyosmocom: repos_url: '{gerrit_url}/python/{repos}' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40860?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: I348a83c8d70c2042bcab9ccaf83be2a638e722e7 Gerrit-Change-Number: 40860 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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>

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-ci[master]: jobs/gerrit: binpkgs: update debian versions

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40861?usp=email ) Change subject: jobs/gerrit: binpkgs: update debian versions ...................................................................... jobs/gerrit: binpkgs: update debian versions Change the default from "debian:10 debian:12" to "debian:11 debian:13", as Debian 13 has just been released and we are about to remove Debian 10 binary packages. Related: https://osmocom.org/news/310 Related: https://osmocom.org/news/308 Related: OS#6826 Change-Id: Ifc1d603c9e6e5054ad2f121f53ba3fb7e4d05286 --- M jobs/gerrit-verifications.yml 1 file changed, 11 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 1a722d7..48ba632 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -104,7 +104,7 @@ # Which jobs to run in the pipeline pipeline_build: true pipeline_lint: true - pipeline_binpkgs: "debian:10 debian:12" + pipeline_binpkgs: "debian:11 debian:13" # in alphabetical order repos: @@ -147,7 +147,7 @@ - libosmo-gprs - libosmo-netif: - pipeline_binpkgs: "centos:7 debian:10 debian:12" # centos7: SYS#6760 (osmo-pcap dep) + pipeline_binpkgs: "centos:7 debian:11 debian:13" # centos7: SYS#6760 (osmo-pcap dep) - libosmo-pfcp - libosmo-sigtran @@ -158,7 +158,7 @@ a1: !!python/tuple [arm-none-eabi, amd64] combination_filter: '!(arch=="arm-none-eabi" && label=="FreeBSD_amd64")' cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins_arch.sh "$arch"' - pipeline_binpkgs: "centos:7 debian:10 debian:12" # centos7: SYS#6760 + pipeline_binpkgs: "centos:7 debian:11 debian:13" # centos7: SYS#6760 - libsmpp34 @@ -214,12 +214,11 @@ repos_url: '{gerrit_url}/erlang/{repos}' gerrit_project: 'erlang/{repos}' cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' - pipeline_binpkgs: "debian:11 debian:12" - osmo-epdg: repos_url: '{gerrit_url}/erlang/{repos}' gerrit_project: 'erlang/{repos}' - pipeline_binpkgs: "debian:12" + pipeline_binpkgs: "debian:12 debian:13" a2_name: JOB_TYPE a2: !!python/tuple ["build", "manuals"] cmd: | @@ -235,7 +234,7 @@ - osmo-s1gw: repos_url: '{gerrit_url}/erlang/{repos}' gerrit_project: 'erlang/{repos}' - pipeline_binpkgs: "debian:12" + pipeline_binpkgs: "debian:12 debian:13" cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' - logger_gsmtap: @@ -309,7 +308,7 @@ {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - osmo-pcap: - pipeline_binpkgs: "centos:7 debian:10 debian:12" # centos7: SYS#6760 + pipeline_binpkgs: "centos:7 debian:11 debian:13" # centos7: SYS#6760 - osmo-pcu: slave_axis: !!python/tuple [osmocom-gerrit, raspbian] @@ -351,7 +350,7 @@ - pyosmocom: repos_url: '{gerrit_url}/python/{repos}' gerrit_project: 'python/{repos}' - pipeline_binpkgs: "debian:12" + pipeline_binpkgs: "debian:12 debian:13" concurrent: false slave_axis: !!python/tuple [simtester,osmocom-gerrit] a2_name: JOB_TYPE @@ -421,13 +420,12 @@ "$DOCKER_IMG" {timeout_cmd} $SETARCH_CMD /build/contrib/jenkins.sh - osmocom-bb: - pipeline_binpkgs: "debian:12" + pipeline_binpkgs: "debian:12 debian:13" - osmo-tetra: pipeline_binpkgs: "" - - osmo-sysmon: - pipeline_binpkgs: "debian:10 debian:12" + - osmo-sysmon - osmo-remsim @@ -457,7 +455,7 @@ pipeline_binpkgs: "" - gapk: - pipeline_binpkgs: "debian:12" + pipeline_binpkgs: "debian:12 debian:13" - osmo-uecups @@ -485,8 +483,7 @@ -e NFTABLES="$NFTABLES" \ {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - - osmo-upf: - pipeline_binpkgs: "debian:11 debian:12" + - osmo-upf - pysim: concurrent: false -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40861?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: Ifc1d603c9e6e5054ad2f121f53ba3fb7e4d05286 Gerrit-Change-Number: 40861 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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>

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-ci[master]: jobs/gerrit: binpkgs: update debian versions

by osmith

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40861?usp=email ) Change subject: jobs/gerrit: binpkgs: update debian versions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40861?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: Ifc1d603c9e6e5054ad2f121f53ba3fb7e4d05286 Gerrit-Change-Number: 40861 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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-Comment-Date: Tue, 12 Aug 2025 11:22:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 weeks, 1 day

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/gerrit: remove binpkgs that are the default

by osmith

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40860?usp=email ) Change subject: jobs/gerrit: remove binpkgs that are the default ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40860?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: I348a83c8d70c2042bcab9ccaf83be2a638e722e7 Gerrit-Change-Number: 40860 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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-Comment-Date: Tue, 12 Aug 2025 11:22:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-ci[master]: jobs/gerrit: binpkgs: update debian versions

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40861?usp=email ) Change subject: jobs/gerrit: binpkgs: update debian versions ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40861?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: Ifc1d603c9e6e5054ad2f121f53ba3fb7e4d05286 Gerrit-Change-Number: 40861 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Aug 2025 11:03:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 weeks, 1 day

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/gerrit: remove binpkgs that are the default

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40860?usp=email ) Change subject: jobs/gerrit: remove binpkgs that are the default ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40860?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: I348a83c8d70c2042bcab9ccaf83be2a638e722e7 Gerrit-Change-Number: 40860 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Aug 2025 11:03:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 weeks, 1 day

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2025