- gerrit-log - lists.osmocom.org

[XS] Change in osmo-ci[master]: jobs/master-builds: rtl-sdr: add jenkins-notifications
by osmith 02 Oct '25

02 Oct '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/41200?usp=email ) Change subject: jobs/master-builds: rtl-sdr: add jenkins-notifications ...................................................................... jobs/master-builds: rtl-sdr: add jenkins-notifications Send mails about failures to the jenkins-notifications mailing list, so they don't go unnoticed. Change-Id: I9b783181a467a76bc2d11149baf433581c91bd06 --- M jobs/master-builds.yml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/00/41200/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index dbdfe51..fec014e 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -609,7 +609,7 @@ - rtl-sdr: repos_url: '{gitea_url}/sdr/{repos}' - email: laforge(a)gnumonks.org steve(a)steve-m.de + email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org steve(a)steve-m.de - pysim: concurrent: false -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41200?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: I9b783181a467a76bc2d11149baf433581c91bd06 Gerrit-Change-Number: 41200 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ci[master]: scripts/osmo-ci-docker-rebuild: switch to trixie
by osmith 02 Oct '25

02 Oct '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/41201?usp=email ) Change subject: scripts/osmo-ci-docker-rebuild: switch to trixie ...................................................................... scripts/osmo-ci-docker-rebuild: switch to trixie Depends: docker-playground I1c0efb85324b70b6370ea94f74f440e639442da5 Change-Id: I1497f14e57f9d7b0867368b923c8f8919c72cd76 --- M scripts/osmo-ci-docker-rebuild.sh 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/01/41201/1 diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh index 1cc1165..d901826 100755 --- a/scripts/osmo-ci-docker-rebuild.sh +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -5,16 +5,21 @@ case "$(arch)" in x86_64) + # OS#6859: still need bookworm for osmo-opencm3-projects docker_images_require \ "debian-bookworm-build" \ - "debian-bookworm-erlang" + "debian-bookworm-erlang" \ + "debian-trixie-build" ;; arm*|aarch64) # OS#6627: need to run a separate "docker pull" command with platform + # OS#6858: still need bookworm for osmo-pcu docker pull docker.io/arm32v7/debian:bookworm --platform="linux/arm/v7" + docker pull docker.io/arm32v7/debian:trixie --platform="linux/arm/v7" export NO_DOCKER_IMAGE_PULL=1 docker_images_require \ - "debian-bookworm-build-arm" + "debian-bookworm-build-arm" \ + "debian-trixie-build-arm" ;; esac -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41201?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: I1497f14e57f9d7b0867368b923c8f8919c72cd76 Gerrit-Change-Number: 41201 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-ci[master]: jobs/gerrit,master: use debian-trixie-build
by osmith 02 Oct '25

02 Oct '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/41202?usp=email ) Change subject: jobs/gerrit,master: use debian-trixie-build ...................................................................... jobs/gerrit,master: use debian-trixie-build Change-Id: Id65b7f9045e13bed38c1de514cdd537fac88f60f --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/02/41202/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 614abde..72d75bc 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -95,7 +95,7 @@ -e CCACHE_DIR="/ccache" \ -e PATH="/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \ -v "$CCACHE_DIR:/ccache" \ - docker_img: '$USER/debian-bookworm-build' + docker_img: '$USER/debian-trixie-build' 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' @@ -338,7 +338,7 @@ DOCKER_IMG="{docker_img}" case "$(arch)" in arm*|aarch64) - DOCKER_IMG="$DOCKER_IMG-arm" + DOCKER_IMG="$USER/debian-bookworm-build-arm" # OS#6858 SETARCH_CMD="setarch linux32" ;; esac @@ -445,7 +445,8 @@ - simtrace2 - osmo-opencm3-projects: - cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh' + # bookworm: OS#6859 + cmd: '{docker_run} $USER/debian-bookworm-build {wrapper_cmd} /build/contrib/jenkins.sh' pipeline_binpkgs: "" - osmo-asf4-dfu: diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index fec014e..43ae3e8 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -78,7 +78,7 @@ -e CCACHE_DIR="/ccache" \ -e PATH="/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \ -v "$CCACHE_DIR:/ccache" \ - docker_img: '$USER/debian-bookworm-build' + docker_img: '$USER/debian-trixie-build' 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' @@ -454,7 +454,7 @@ DOCKER_IMG="{docker_img}" case "$(arch)" in arm*|aarch64) - DOCKER_IMG="$DOCKER_IMG-arm" + DOCKER_IMG="$USER/debian-bookworm-build-arm" # OS#6858 SETARCH_CMD="setarch linux32" ;; esac @@ -574,7 +574,8 @@ - docs_ftp.osmocom.org - osmo-opencm3-projects: repos_url: '{gitea_url}/electronics/{repos}' - cmd: '{docker_run} {docker_img} {wrapper_cmd} /build/contrib/jenkins.sh --publish' + # bookworm: OS#6859 + cmd: '{docker_run} $USER/debian-bookworm-build {wrapper_cmd} /build/contrib/jenkins.sh --publish' email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de ssh: - binaries_ftp.osmocom.org -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41202?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: Id65b7f9045e13bed38c1de514cdd537fac88f60f Gerrit-Change-Number: 41202 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in docker-playground[master]: debian-trixie-build-arm: new container
by osmith 02 Oct '25

02 Oct '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/41199?usp=email ) Change subject: debian-trixie-build-arm: new container ...................................................................... debian-trixie-build-arm: new container Change-Id: I1c0efb85324b70b6370ea94f74f440e639442da5 --- A debian-trixie-build-arm/Dockerfile A debian-trixie-build-arm/Makefile 2 files changed, 94 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/99/41199/1 diff --git a/debian-trixie-build-arm/Dockerfile b/debian-trixie-build-arm/Dockerfile new file mode 100644 index 0000000..cd462c3 --- /dev/null +++ b/debian-trixie-build-arm/Dockerfile @@ -0,0 +1,91 @@ +# Image used to run contrib/jenkins.sh scripts of a few Osmocom projects on +# arm. Keep this image minimal so the rpis don't need forever to build it. +# See master-builds.yml, gerrit-verifications.yml in osmo-ci.git. +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:trixie +FROM ${REGISTRY}/arm32v7/${UPSTREAM_DISTRO} + +# Arguments used after FROM must be specified again +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" +ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/Debian_13/" +ARG UID + +# Copy from common dir +COPY .common/Release.key /etc/apt/trusted.gpg.d/obs.osmocom.org.asc + +# Configure build user, disable installing man pages +# * man pages: without them we avoid waiting for "generating manpages" +RUN set -x && \ + useradd --uid=${UID} -d /build -m build && \ + chown -R build:build /usr/local && \ + \ + echo "path-exclude=/usr/share/man/*" \ + > /etc/dpkg/dpkg.cfg.d/exclude-man-pages && \ + rm -rf /usr/share/man/ + +# Install packages from Debian repositories (alphabetic order) +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + autoconf \ + automake \ + bzip2 \ + ca-certificates \ + ccache \ + g++ \ + gcc \ + git \ + libbladerf-dev \ + libboost-dev \ + libboost-filesystem-dev \ + libboost-program-options-dev \ + libboost-thread-dev \ + libfftw3-dev \ + libgnutls28-dev \ + liblimesuite-dev \ + libmnl-dev \ + libortp-dev \ + libpcsclite-dev \ + libsctp-dev \ + libtalloc-dev \ + libtool \ + libuhd-dev \ + liburing-dev \ + libusb-1.0-0-dev \ + make \ + pkg-config \ + python3-minimal \ + python3-setuptools \ + stow \ + && \ + apt-get clean + +# Install osmo-python-tests +ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/maste… /tmp/osmo-python-tests-commit +RUN set -x && \ + git clone --depth=1 https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests && \ + cd osmo-python-tests && \ + python3 setup.py clean build install && \ + cd .. && \ + rm -rf osmo-python-tests + +# Install osmo-ci.git/scripts to /usr/local/bin +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ci/+/master?format=TEXT /tmp/osmo-ci-commit +RUN set -x && \ + git clone --depth=1 https://gerrit.osmocom.org/osmo-ci osmo-ci && \ + su build -c "cd osmo-ci/scripts && cp -v *.sh *.py /usr/local/bin" && \ + rm -rf osmo-ci + +# Install packages from Osmocom OBS nightly repository +# * osmo-trx: sdcc (OS#6748) +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN set -x && \ + echo "deb [signed-by=/etc/apt/trusted.gpg.d/obs.osmocom.org.asc] $OSMOCOM_REPO ./" \ + > /etc/apt/sources.list.d/osmocom-nightly.list && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + -t'o=obs://osmocom/osmocom:nightly/Debian_13,n=Debian_13,l=osmocom:nightly,c=' \ + sdcc \ + && \ + apt-get clean diff --git a/debian-trixie-build-arm/Makefile b/debian-trixie-build-arm/Makefile new file mode 100644 index 0000000..bbbc0f3 --- /dev/null +++ b/debian-trixie-build-arm/Makefile @@ -0,0 +1,3 @@ +UPSTREAM_DISTRO=debian:trixie +DISTRO=debian-trixie +include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/41199?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: I1c0efb85324b70b6370ea94f74f440e639442da5 Gerrit-Change-Number: 41199 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in docker-playground[master]: debian-trixie-build: new container
by osmith 02 Oct '25

02 Oct '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/41198?usp=email ) Change subject: debian-trixie-build: new container ...................................................................... debian-trixie-build: new container Create a copy of debian-bookworm-build for trixie. Change-Id: I880b5d9c57642af98c116fcb4137a54c58f5f7b4 --- A debian-trixie-build/Dockerfile A debian-trixie-build/Makefile M jenkins-common.sh 3 files changed, 240 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/98/41198/1 diff --git a/debian-trixie-build/Dockerfile b/debian-trixie-build/Dockerfile new file mode 100644 index 0000000..7f82fe5 --- /dev/null +++ b/debian-trixie-build/Dockerfile @@ -0,0 +1,234 @@ +# Image for building all Osmocom projects in master/gerrit/ttcn3 jenkins jobs +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:trixie +FROM ${REGISTRY}/${UPSTREAM_DISTRO} + +# Arguments used after FROM must be specified again +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" +ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/${OSMOCOM_REPO_PATH}/nightly/Debian_13/" +ARG UID +ARG LLVM_VERSION="14.0.0" + +# Copy from common dir +COPY .common/respawn.sh /usr/local/bin/respawn.sh +COPY .common/Release.key /etc/apt/trusted.gpg.d/obs.osmocom.org.asc + +# Configure build user, disable installing man pages +# * /usr/local: osmo-python-tests's contrib/jenkins.sh writes there +# * man pages: without them we avoid waiting for "generating manpages" +RUN set -x && \ + useradd --uid=${UID} -d /build -m build && \ + chown -R build:build /usr/local && \ + \ + echo "path-exclude=/usr/share/man/*" \ + > /etc/dpkg/dpkg.cfg.d/exclude-man-pages && \ + rm -rf /usr/share/man/ + +# Install LLVM-embedded-toolchain-for-Arm +# This binary is built against libtinfo5, which isn't in trixie so use the +# bookworm version for it. +RUN if [ "$(arch)" != "x86_64" ]; then \ + echo "ERROR: use debian-trixie-build-arm instead"; \ + exit 1; \ + fi && \ + set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + wget \ + && \ + apt-get clean && \ + wget -q http://ftp.de.debian.org/debian/pool/main/n/ncurses/libtinfo5_6.4-4_amd64.d… && \ + dpkg -i "libtinfo5_6.4-4_amd64.deb" && \ + rm "libtinfo5_6.4-4_amd64.deb" && \ + wget -q https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/do… && \ + tar -xf LLVMEmbeddedToolchainForArm-${LLVM_VERSION}-linux.tar.gz && \ + rm LLVMEmbeddedToolchainForArm-${LLVM_VERSION}-linux.tar.gz && \ + mv LLVMEmbeddedToolchainForArm-${LLVM_VERSION} /opt/llvm-arm && \ + /opt/llvm-arm/bin/clang --version && \ + /opt/llvm-arm/bin/clang --print-targets + +# Install packages from Debian repositories (alphabetic order) +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + asciidoc \ + asciidoc-dblatex \ + autoconf \ + autoconf-archive \ + autogen \ + automake \ + bc \ + bison \ + build-essential \ + bzip2 \ + ca-certificates \ + ccache \ + clang-format \ + cmake \ + coccinelle \ + cppcheck \ + curl \ + dahdi-source \ + dblatex \ + dbus \ + debhelper \ + devscripts \ + dh-autoreconf \ + docbook5-xml \ + doxygen \ + equivs \ + flex \ + g++ \ + gawk \ + gcc \ + gcc-arm-none-eabi \ + gdb \ + ghostscript \ + git \ + gnupg \ + graphviz \ + htop \ + iproute2 \ + latexmk \ + lcov \ + libaio-dev \ + libasound2-dev \ + libbladerf-dev \ + libboost-all-dev \ + libc-ares-dev \ + libcdk5-dev \ + libcsv-dev \ + libdbd-sqlite3 \ + libdbi-dev \ + libelf-dev \ + libffi-dev \ + libfftw3-dev \ + libgmp-dev \ + libgnutls28-dev \ + libgps-dev \ + libgsm1-dev \ + libidn-dev \ + libjansson-dev \ + liblimesuite-dev \ + liblua5.3-dev \ + libmnl-dev \ + libmongoc-dev \ + libncurses5-dev \ + libnewlib-arm-none-eabi \ + libnftables-dev \ + libnftnl-dev \ + libnghttp2-dev \ + libnl-3-dev \ + libnl-route-3-dev \ + liboping-dev \ + libortp-dev \ + libpcap-dev \ + libpcsclite-dev \ + libreadline-dev \ + librsvg2-bin \ + libsctp-dev \ + libsigsegv-dev \ + libsnmp-dev \ + libsofia-sip-ua-glib-dev \ + libsqlite3-dev \ + libssl-dev \ + libtalloc-dev \ + libtinfo5 \ + libtool \ + libuhd-dev \ + libulfius-dev \ + liburing-dev \ + libusb-1.0-0-dev \ + libusb-dev \ + libxml2-utils \ + libyaml-dev \ + libzmq3-dev \ + locales \ + lua-socket \ + make \ + meson \ + mscgen \ + ofono \ + openssh-client \ + patchelf \ + picolibc-arm-none-eabi \ + pkg-config \ + pylint \ + python3 \ + python3-gi \ + python3-mako \ + python3-nwdiag \ + python3-pip \ + python3-pyflakes \ + python3-pytest \ + python3-setuptools \ + python3-usb \ + python3-yaml \ + rsync \ + source-highlight \ + sqlite3 \ + stow \ + sudo \ + swig \ + systemd \ + tcpdump \ + telnet \ + tex-gyre \ + texinfo \ + unzip \ + virtualenv \ + xsltproc \ + xxd \ + && \ + apt-get clean + +# Install pip dependencies (alphabetic order) +# break-system-packages: inside docker it's fine to install pkgs system-wide +# lcov-to-cobertura-xml: use this commit as the latest version fails: +# https://github.com/eriwen/lcov-to-cobertura-xml/issues/63 +ADD https://gitea.osmocom.org/sim-card/pysim/raw/branch/master/requirements.txt /tmp/pysim_requirements.txt +RUN set -x && \ + cat /tmp/pysim_requirements.txt && \ + pip3 install --break-system-packages \ + 'git+https://github.com/eriwen/lcov-to-cobertura-xml.git@028da3798355d0260c6…' \ + 'git+https://github.com/osmocom/sphinx-argparse@inside-classes#egg=sphinx-ar…' \ + 'git+https://github.com/podshumok/python-smpplib.git' \ + 'ruff' \ + 'sphinx' \ + 'sphinxcontrib-napoleon' \ + -r /tmp/pysim_requirements.txt + +# Install osmo-python-tests +ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/maste… /tmp/osmo-python-tests-commit +RUN set -x && \ + git clone --depth=1 https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests && \ + cd osmo-python-tests && \ + python3 setup.py clean build install && \ + cd .. && \ + rm -rf osmo-python-tests + +# Install osmo-ci.git/scripts to /usr/local/bin +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ci/+/master?format=TEXT /tmp/osmo-ci-commit +RUN set -x && \ + git clone --depth=1 https://gerrit.osmocom.org/osmo-ci osmo-ci && \ + su build -c "cd osmo-ci/scripts && cp -v *.sh *.py /usr/local/bin" && \ + rm -rf osmo-ci + +# Install osmo-gsm-manuals to /opt/osmo-gsm-manuals +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-gsm-manuals/+/master?format… /tmp/osmo-gsm-manuals-commit +RUN git -C /opt clone --depth=1 https://gerrit.osmocom.org/osmo-gsm-manuals + +# Install packages from Osmocom OBS nightly repository +# * osmo-trx: sdcc (OS#6748) +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN set -x && \ + echo "deb [signed-by=/etc/apt/trusted.gpg.d/obs.osmocom.org.asc] $OSMOCOM_REPO ./" \ + > /etc/apt/sources.list.d/osmocom-nightly.list && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + -t'o=obs://osmocom/osmocom:nightly/Debian_13,n=Debian_13,l=osmocom:nightly,c=' \ + sdcc \ + && \ + apt-get clean diff --git a/debian-trixie-build/Makefile b/debian-trixie-build/Makefile new file mode 100644 index 0000000..bbbc0f3 --- /dev/null +++ b/debian-trixie-build/Makefile @@ -0,0 +1,3 @@ +UPSTREAM_DISTRO=debian:trixie +DISTRO=debian-trixie +include ../make/Makefile diff --git a/jenkins-common.sh b/jenkins-common.sh index 31ad497..57d2190 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -46,6 +46,7 @@ debian-buster-*) echo "debian-buster" ;; debian-bullseye-*) echo "debian-bullseye" ;; debian-bookworm-*) echo "debian-bookworm" ;; + debian-trixie-*) echo "debian-trixie" ;; *) echo "debian-$DEBIAN_DEFAULT" ;; esac } @@ -61,10 +62,12 @@ debian10-*) echo "debian/eol:buster" ;; debian11-*) echo "debian:bullseye" ;; debian12-*) echo "debian:bookworm" ;; + debian13-*) echo "debian:trixie" ;; debian-stretch-*) echo "debian/eol:stretch" ;; debian-buster-*) echo "debian/eol:buster" ;; debian-bullseye-*) echo "debian:bullseye" ;; debian-bookworm-*) echo "debian:bookworm" ;; + debian-trixie-*) echo "debian:trixie" ;; *) echo "debian:$DEBIAN_DEFAULT" ;; esac } -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/41198?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: I880b5d9c57642af98c116fcb4137a54c58f5f7b4 Gerrit-Change-Number: 41198 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-bts[master]: Fix build with debian 13
by osmith 02 Oct '25

02 Oct '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/41197?usp=email ) Change subject: Fix build with debian 13 ...................................................................... Fix build with debian 13 oml.c:461:20: error: returning 'HANDLE' {aka 'void *'} from a function with return type 'uint32_t' {aka 'unsigned int'} makes integer from pointer without a cast [-Wint-conversion] Change-Id: I0831e448692713c488c0590a86bdc99b37160f47 --- M src/osmo-bts-lc15/oml.c M src/osmo-bts-oc2g/oml.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/41197/1 diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c index 6f312e8..ce70d3c 100644 --- a/src/osmo-bts-lc15/oml.c +++ b/src/osmo-bts-lc15/oml.c @@ -458,7 +458,7 @@ { const struct lc15l1_hdl *fl1h = trx_lc15l1_hdl(trx); - return fl1h->hLayer1; + return (uint32_t)fl1h->hLayer1; } static int trx_close_compl_cb(struct gsm_bts_trx *trx, struct msgb *l1_msg, diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c index 4b434e8..5244b68 100644 --- a/src/osmo-bts-oc2g/oml.c +++ b/src/osmo-bts-oc2g/oml.c @@ -473,7 +473,7 @@ { const struct oc2gl1_hdl *fl1h = trx_oc2gl1_hdl(trx); - return fl1h->hLayer1; + return (uint32_t)fl1h->hLayer1; } static int trx_close_compl_cb(struct gsm_bts_trx *trx, struct msgb *l1_msg, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41197?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0831e448692713c488c0590a86bdc99b37160f47 Gerrit-Change-Number: 41197 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: Pass pylint 3.3.4 from debian trixie
by osmith 02 Oct '25

02 Oct '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/41196?usp=email ) Change subject: Pass pylint 3.3.4 from debian trixie ...................................................................... Pass pylint 3.3.4 from debian trixie ************* Module osmo-smdpp osmo-smdpp.py:657:72: E0606: Possibly using variable 'iccid_str' before assignment (possibly-used-before-assignment) => False-positive: code paths that don't set iccid_str raise an error, so this shouldn't be a problem. ************* Module pySim-smpp2sim pySim-smpp2sim.py:427:4: E1101: Module 'twisted.internet.reactor' has no 'run' member (no-member) => False-positive: pylint doesn't recognize dynamically set attributes. ************* Module es9p_client contrib/es9p_client.py:126:11: E0606: Possibly using variable 'opts' before assignment (possibly-used-before-assignment) => Real bug, should be "self.opts". Related: https://stackoverflow.com/a/18712867 Change-Id: Id042ba0944b58d98d27e1222ac373c7206158a91 --- M contrib/es9p_client.py M osmo-smdpp.py M pyproject.toml 3 files changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/96/41196/1 diff --git a/contrib/es9p_client.py b/contrib/es9p_client.py index 15a96ae..e9a71fc 100755 --- a/contrib/es9p_client.py +++ b/contrib/es9p_client.py @@ -123,8 +123,8 @@ 'profileManagementOperation': PMO(self.opts.operation).to_bitstring(), 'notificationAddress': self.opts.notification_address or urlparse(self.opts.url).netloc, } - if opts.iccid: - ntf_metadata['iccid'] = h2b(swap_nibbles(opts.iccid)) + if self.opts.iccid: + ntf_metadata['iccid'] = h2b(swap_nibbles(self.opts.iccid)) if self.opts.operation == 'download': pird = { diff --git a/osmo-smdpp.py b/osmo-smdpp.py index a45f842..ed5046d 100755 --- a/osmo-smdpp.py +++ b/osmo-smdpp.py @@ -629,6 +629,7 @@ # If ctxParams1 contains a ctxParamsForCommonAuthentication data object, the SM-DP+ Shall [...] # TODO: We really do a very simplistic job here, this needs to be properly implemented later, # considering all the various cases, profile state, etc. + iccid_str = None if euiccSigned1['ctxParams1'][0] == 'ctxParamsForCommonAuthentication': cpca = euiccSigned1['ctxParams1'][1] matchingId = cpca.get('matchingId', None) diff --git a/pyproject.toml b/pyproject.toml index 9787c3b..8924896 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,6 @@ [build-system] requires = ["setuptools", "wheel"] build-backend = "setuptools.build_meta" + +[tool.pylint.main] +ignored-classes = ["twisted.internet.reactor"] -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41196?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: Id042ba0944b58d98d27e1222ac373c7206158a91 Gerrit-Change-Number: 41196 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ccid-firmware[master]: contrib/jenkins: use osmo-clean-workspace.sh
by osmith 02 Oct '25

02 Oct '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41183?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: contrib/jenkins: use osmo-clean-workspace.sh ...................................................................... contrib/jenkins: use osmo-clean-workspace.sh Clean the workspace at the beginning, because otherwise the build fails when running twice in a row. For some reason a pseudo-talloc.h from libosmocore appears, resulting in: error: implicit declaration of function 'talloc_report_full' Change-Id: If2e29ffd5150b57858b46e92e157f83a0cf3a11a --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 0bf6771..0e3e414 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -14,6 +14,7 @@ inst="$TOPDIR/install" export deps inst +osmo-clean-workspace.sh echo echo "=============== libosmocore host build ===========" -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41183?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: If2e29ffd5150b57858b46e92e157f83a0cf3a11a Gerrit-Change-Number: 41183 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(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>

1 0

[XS] Change in osmo-ccid-firmware[master]: ysmoOCTSIM/usb/class/dfu: fix missing include
by osmith 02 Oct '25

02 Oct '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41182?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ysmoOCTSIM/usb/class/dfu: fix missing include ...................................................................... ysmoOCTSIM/usb/class/dfu: fix missing include Fix for: ../usb/class/dfu/device/dfudf.c:199:17: error: implicit declaration of function 'delay_us' [-Wimplicit-function-declaration] Change-Id: Ia36d25d47f4d5dc4e38c1ea9c8e193ff52f5b5d1 --- M sysmoOCTSIM/usb/class/dfu/device/dfudf.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/sysmoOCTSIM/usb/class/dfu/device/dfudf.c b/sysmoOCTSIM/usb/class/dfu/device/dfudf.c index 5e5db89..d9b5520 100644 --- a/sysmoOCTSIM/usb/class/dfu/device/dfudf.c +++ b/sysmoOCTSIM/usb/class/dfu/device/dfudf.c @@ -22,7 +22,7 @@ #include "dfudf.h" #include "usb_dfu.h" - +#include "hal_delay.h" /** USB Device DFU Function Specific Data */ struct dfudf_func_data { -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41182?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ia36d25d47f4d5dc4e38c1ea9c8e193ff52f5b5d1 Gerrit-Change-Number: 41182 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(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>

1 0

[XS] Change in osmo-ccid-firmware[master]: ccid_hosts: fix missing talloc_report_full
by osmith 02 Oct '25

02 Oct '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41181?usp=email ) Change subject: ccid_hosts: fix missing talloc_report_full ...................................................................... ccid_hosts: fix missing talloc_report_full Fix for: ccid_main_functionfs.c:534:17: error: implicit declaration of function 'talloc_report_full' [-Wimplicit-function-declaration] 534 | talloc_report_full(g_tall_ctx, stderr); Change-Id: I2b79d6f28e80acef8e1cab0dab949233698336ad --- M ccid_host/Makefile M ccid_host/ccid_main_functionfs.c M ccid_host/cuart_fsm_test.c M ccid_host/hub_main_functionfs.c 4 files changed, 5 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/ccid_host/Makefile b/ccid_host/Makefile index b117232..718377a 100644 --- a/ccid_host/Makefile +++ b/ccid_host/Makefile @@ -1,12 +1,14 @@ CFLAGS= \ -Wall \ -g \ + $(shell pkg-config --cflags talloc) \ $(shell pkg-config --cflags libosmocore) \ -I../ccid_common \ -I. \ $(NULL) LIBS?= \ -lasan \ + $(shell pkg-config --libs talloc) \ $(shell pkg-config --libs libosmocore) \ $(NULL) diff --git a/ccid_host/ccid_main_functionfs.c b/ccid_host/ccid_main_functionfs.c index dd1e274..1764900 100644 --- a/ccid_host/ccid_main_functionfs.c +++ b/ccid_host/ccid_main_functionfs.c @@ -24,6 +24,7 @@ #include <signal.h> #include <sys/types.h> #include <linux/usb/functionfs.h> +#include <talloc.h> #include "ccid_proto.h" #include "logging.h" diff --git a/ccid_host/cuart_fsm_test.c b/ccid_host/cuart_fsm_test.c index 001f8e7..900c90c 100644 --- a/ccid_host/cuart_fsm_test.c +++ b/ccid_host/cuart_fsm_test.c @@ -22,6 +22,7 @@ #include <stdio.h> #include <errno.h> #include <signal.h> +#include <talloc.h> #include <osmocom/core/utils.h> #include <osmocom/core/logging.h> #include <osmocom/core/application.h> diff --git a/ccid_host/hub_main_functionfs.c b/ccid_host/hub_main_functionfs.c index 6d31243..201e29e 100644 --- a/ccid_host/hub_main_functionfs.c +++ b/ccid_host/hub_main_functionfs.c @@ -25,6 +25,7 @@ #include <sys/types.h> #include <linux/usb/functionfs.h> #include <linux/usb/ch11.h> +#include <talloc.h> #if __BYTE_ORDER == __LITTLE_ENDIAN #define cpu_to_le16(x) (x) -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/41181?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I2b79d6f28e80acef8e1cab0dab949233698336ad Gerrit-Change-Number: 41181 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(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>

1 0

2025

2024

2023

2022

gerrit-log