- gerrit-log - lists.osmocom.org

[XS] Change in aram-applet[master]: contrib/jenkins.sh: new script
by pespin 19 Feb '25

19 Feb '25

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/aram-applet/+/39582?usp=email ) Change subject: contrib/jenkins.sh: new script ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/aram-applet/+/39582?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: aram-applet Gerrit-Branch: master Gerrit-Change-Id: If486aba5e455b2635714b91ccdc03b5153ee73d8 Gerrit-Change-Number: 39582 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 19 Feb 2025 13:22:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in docker-playground[master]: debian-bookworm-aram-applet: new container
by osmith 19 Feb '25

19 Feb '25

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/39585?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: debian-bookworm-aram-applet: new container ...................................................................... debian-bookworm-aram-applet: new container Add a container for building aram-applet. Related: SYS#7293 Change-Id: I6ed01bb837bffe6581a4c0d0b1cda39abb375fd5 --- A debian-bookworm-aram-applet/Dockerfile A debian-bookworm-aram-applet/Makefile 2 files changed, 43 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/85/39585/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39585?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6ed01bb837bffe6581a4c0d0b1cda39abb375fd5 Gerrit-Change-Number: 39585 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[S] Change in osmo-ci[master]: jobs/gerrit-verifications: add aram-applet
by osmith 19 Feb '25

19 Feb '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/39589?usp=email ) Change subject: jobs/gerrit-verifications: add aram-applet ...................................................................... jobs/gerrit-verifications: add aram-applet Change-Id: Ic0fa5d3d89e4af2e812d3d598dfef4b5c9e0a8b6 --- M jobs/gerrit-verifications.yml 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/89/39589/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 245aba0..4176d26 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -94,6 +94,7 @@ docker_img: '$USER/debian-bookworm-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' timeout_cmd: '/usr/bin/timeout 30m' cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh' gerrit_url: 'ssh://jenkins@gerrit.osmocom.org:29418' @@ -119,6 +120,16 @@ -v "$GRADLE_CACHE":/build/.gradle \ {docker_img_android} {timeout_cmd} contrib/jenkins.sh + - aram-applet: + pipeline_binpkgs: "" + cmd: | + docker pull {docker_img_aram_applet} + {docker_run} \ + {docker_img_aram_applet} {timeout_cmd} sh -exc " + ln -sf /cache/aram-applet/.gradle . + contrib/jenkins.sh + " + - asn1c: pipeline_binpkgs: "" pipeline_lint: false -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39589?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: Ic0fa5d3d89e4af2e812d3d598dfef4b5c9e0a8b6 Gerrit-Change-Number: 39589 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ci[master]: jobs/master-builds: remove redundant branch
by osmith 19 Feb '25

19 Feb '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/39587?usp=email ) Change subject: jobs/master-builds: remove redundant branch ...................................................................... jobs/master-builds: remove redundant branch We don't need this line, as this is just the default branch. Change-Id: I8d5d8896b9a76219423e0b7f13bcce2924c75c79 --- M jobs/master-builds.yml 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/87/39587/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 0e3080b..32815cf 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -92,7 +92,6 @@ # in alphabetical order repos: - android-apdu-proxy: - branch: master cmd: | ANDROID_CACHE="$HOME/android-cache/master-builds/android" GRADLE_CACHE="$HOME/android-cache/master-builds/gradle" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39587?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: I8d5d8896b9a76219423e0b7f13bcce2924c75c79 Gerrit-Change-Number: 39587 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-ci[master]: jobs/master-builds: add aram-applet
by osmith 19 Feb '25

19 Feb '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/39588?usp=email ) Change subject: jobs/master-builds: add aram-applet ...................................................................... jobs/master-builds: add aram-applet Change-Id: Ie6ea415b29bdd33a8dab3add9850707a98115be1 --- M jobs/master-builds.yml 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/88/39588/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 32815cf..720c159 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -77,6 +77,7 @@ docker_img: '$USER/debian-bookworm-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' timeout_cmd: '/usr/bin/timeout 30m' cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh' trigger: @@ -103,6 +104,16 @@ {docker_img_android} {timeout_cmd} contrib/jenkins.sh archive_artifacts_on_success: true + - aram-applet: + cmd: | + docker pull {docker_img_aram_applet} + {docker_run} \ + {docker_img_aram_applet} {timeout_cmd} sh -exc " + ln -sf /cache/aram-applet/.gradle . + contrib/jenkins.sh + " + archive_artifacts_on_success: true + - asn1c: branch: osmo-iuh/master @@ -705,7 +716,7 @@ publishers: - archive: allow-empty: true - artifacts: '**/core, **/testsuite.log, **/workspace.tar.xz, **/app-release.apk' + artifacts: '**/core, **/testsuite.log, **/workspace.tar.xz, **/app-release.apk, **/applet.cap' - warnings: console-log-parsers: - 'GNU C Compiler 4 (gcc)' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39588?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: Ie6ea415b29bdd33a8dab3add9850707a98115be1 Gerrit-Change-Number: 39588 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ci[master]: jobs/registry-rebuild-upload: add …-aram-applet
by osmith 19 Feb '25

19 Feb '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/39586?usp=email ) Change subject: jobs/registry-rebuild-upload: add …-aram-applet ...................................................................... jobs/registry-rebuild-upload: add …-aram-applet Related: SYS#7293 Depends: docker-playground I6ed01bb837bffe6581a4c0d0b1cda39abb375fd5 Change-Id: Iaf2bfcadae51c6f9297fff747e535701a2c5ce84 --- M jobs/registry-rebuild-upload.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/86/39586/1 diff --git a/jobs/registry-rebuild-upload.yml b/jobs/registry-rebuild-upload.yml index c5a094a..87becf0 100644 --- a/jobs/registry-rebuild-upload.yml +++ b/jobs/registry-rebuild-upload.yml @@ -5,6 +5,8 @@ job-name: - registry-rebuild-upload-android: image: "debian-bookworm-android" + - registry-rebuild-upload-aram-applet: + image: "debian-bookworm-aram-applet" - job-template: name: '{job-name}' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39586?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: Iaf2bfcadae51c6f9297fff747e535701a2c5ce84 Gerrit-Change-Number: 39586 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in docker-playground[master]: debian-bookworm-aram-applet: new container
by osmith 19 Feb '25

19 Feb '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/39585?usp=email ) Change subject: debian-bookworm-aram-applet: new container ...................................................................... debian-bookworm-aram-applet: new container Add a container for building aram-applet. Related: SYS#7293 Change-Id: I6ed01bb837bffe6581a4c0d0b1cda39abb375fd5 --- A debian-bookworm-aram-applet/Dockerfile A debian-bookworm-aram-applet/Makefile A debian-bookworm-aram-applet/debian9-sources.list 3 files changed, 45 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/85/39585/1 diff --git a/debian-bookworm-aram-applet/Dockerfile b/debian-bookworm-aram-applet/Dockerfile new file mode 100644 index 0000000..5151fd5 --- /dev/null +++ b/debian-bookworm-aram-applet/Dockerfile @@ -0,0 +1,40 @@ +# Image for building https://gitea.osmocom.org/sim-card/aram-applet +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:bookworm +FROM ${REGISTRY}/${UPSTREAM_DISTRO} +ARG UID +ENV APT_INSTALL="apt-get install -y --no-install-recommends" +ENV SOURCES_LIST="/etc/apt/sources.list.d/debian9-sources.list" + +# Add the build user +RUN useradd --uid=${UID} -m build && \ + mkdir /cache /build && \ + chown build:build /cache /build + +# Install openjdk-8 from Debian 9 +# (x11-common gets pulled in as dep and must be installed first or it fails) +RUN set -x && \ + apt-get update && \ + $APT_INSTALL ca-certificates && \ + echo "deb [trusted=yes] https://archive.debian.org/debian stretch main" >>"$SOURCES_LIST" && \ + echo "deb [trusted=yes] https://archive.debian.org/debian-security stretch/updates main" >>"$SOURCES_LIST" && \ + apt-get update && \ + $APT_INSTALL x11-common && \ + $APT_INSTALL -t stretch ca-certificates-java openjdk-8-jdk-headless && \ + apt-get clean + +# Install other packages +RUN set -x && \ + apt-get update && \ + $APT_INSTALL git && \ + apt-get clean + +USER build + +# Build aram-applet once to download and cache dependencies +ADD https://gerrit.osmocom.org/plugins/gitiles/aram-applet/+/refs/heads/master/… /tmp/build.gradle +RUN set -x && \ + git -C /cache clone --depth=1 https://gerrit.osmocom.org/aram-applet && \ + cd /cache/aram-applet && \ + git submodule update --init && \ + ./gradlew build diff --git a/debian-bookworm-aram-applet/Makefile b/debian-bookworm-aram-applet/Makefile new file mode 100644 index 0000000..cdac90c --- /dev/null +++ b/debian-bookworm-aram-applet/Makefile @@ -0,0 +1,3 @@ +UPSTREAM_DISTRO=debian:bookworm +DISTRO=debian-bookworm +include ../make/Makefile diff --git a/debian-bookworm-aram-applet/debian9-sources.list b/debian-bookworm-aram-applet/debian9-sources.list new file mode 100644 index 0000000..4022565 --- /dev/null +++ b/debian-bookworm-aram-applet/debian9-sources.list @@ -0,0 +1,2 @@ +deb [trusted=yes] https://archive.debian.org/debian stretch main +deb [trusted=yes] https://archive.debian.org/debian-security stretch/updates main -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39585?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: I6ed01bb837bffe6581a4c0d0b1cda39abb375fd5 Gerrit-Change-Number: 39585 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in aram-applet[master]: contrib/jenkins.sh: new script
by osmith 19 Feb '25

19 Feb '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/aram-applet/+/39582?usp=email ) Change subject: contrib/jenkins.sh: new script ...................................................................... contrib/jenkins.sh: new script Add a CI script for https://jenkins.osmocom.org. Change-Id: If486aba5e455b2635714b91ccdc03b5153ee73d8 --- A contrib/jenkins.sh 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/aram-applet refs/changes/82/39582/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 0000000..cb67e3c --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,7 @@ +#!/bin/sh -ex + +# Build and run tests +./gradlew build + +# Build "aram/build/javacard/applet.cap" +./gradlew buildJavaCard -- To view, visit https://gerrit.osmocom.org/c/aram-applet/+/39582?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: aram-applet Gerrit-Branch: master Gerrit-Change-Id: If486aba5e455b2635714b91ccdc03b5153ee73d8 Gerrit-Change-Number: 39582 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in aram-applet[master]: README: update after setting up gerrit and jenkins
by osmith 19 Feb '25

19 Feb '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/aram-applet/+/39584?usp=email ) Change subject: README: update after setting up gerrit and jenkins ...................................................................... README: update after setting up gerrit and jenkins Change-Id: Ia27839881c0c739f58835ed883079b3ea60cb0e1 --- M README.md 1 file changed, 22 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/aram-applet refs/changes/84/39584/1 diff --git a/README.md b/README.md index b11c171..fc25c1e 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,23 @@ # ARAM Applet -[![Build Status](https://travis-ci.org/bertrandmartel/aram-applet.svg?branch=master)… -[![Coverage Status](https://coveralls.io/repos/github/bertrandmartel/aram-applet/badge.svg?branch=master)](https://coveralls.io/github/bertrandmartel/aram-applet?branch=master) - JavaCard implementation of Global Platform Access Rule Application Master (ARA-M) applet according to [Secure Element Access Control v1.1](https://globalplatform.org/specs-library/secure-element-access-contro… specification. +## Contributing + +The git repository for this project is at: +https://gitea.osmocom.org/sim-card/aram-applet + +This project was forked from: +https://github.com/bertrandmartel/aram-applet + +We use Gerrit for patch submission and review. See the +[Osmocom wiki](https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit) +for details. + +The current patch queue for aram-applet can be seen at: +https://gerrit.osmocom.org/#/q/project:aram-applet+status:open + ## What is this ? ARA-M is an application (typically present on a SIM card) which manages access rules that are enforced by an Access Control Enforcer (typically present on [Android device](https://github.com/seek-for-android/pool/wiki)). @@ -49,7 +61,7 @@ #### Prepare the repository ```bash -git clone git@github.com:bertrandmartel/aram-applet.git +git clone https://gitea.osmocom.org/sim-card/aram-applet cd aram-applet git submodule update --init ``` @@ -64,6 +76,9 @@ * Older JDK versions are available here: <https://www.oracle.com/de/java/technologies/javase/jdk11-archive-downloads.…> +Find the pre-built applet of current master as artifact in the +[Osmocom Jenkins](https://jenkins.osmocom.org/jenkins/job/master-aram-applet/lastSuc…. + ```bash JAVA_HOME=/path/to/your/jdk1.8.0_421/ ./gradlew build ``` @@ -146,4 +161,6 @@ ## License -The MIT License (MIT) Copyright (c) 2017 Bertrand Martel \ No newline at end of file +The MIT License (MIT) Copyright (c) 2017 Bertrand Martel + +Copyright (c) 2025 sysmocom - s.f.m.c. GmbH -- To view, visit https://gerrit.osmocom.org/c/aram-applet/+/39584?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: aram-applet Gerrit-Branch: master Gerrit-Change-Id: Ia27839881c0c739f58835ed883079b3ea60cb0e1 Gerrit-Change-Number: 39584 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in aram-applet[master]: gradlew: fix "Unrecognized option: --add-opens"
by osmith 19 Feb '25

19 Feb '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/aram-applet/+/39583?usp=email ) Change subject: gradlew: fix "Unrecognized option: --add-opens" ...................................................................... gradlew: fix "Unrecognized option: --add-opens" Comment out the code that causes the following errors during build: + ./gradlew test Unrecognized option: --add-opens Error: Could not create the Java Virtual Machine. Error: A fatal exception has occurred. Program will exit. The build did not abort but this is distracting. Change-Id: I788e44cfe20ba6a331e8247677ecb5a526c433f7 --- M gradlew 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/aram-applet refs/changes/83/39583/1 diff --git a/gradlew b/gradlew index 17a9170..f03a59b 100755 --- a/gradlew +++ b/gradlew @@ -162,9 +162,10 @@ APP_ARGS=$(save "$@") # Collect all arguments for the java command, following the shell quoting and substitution rules -if $JAVACMD --add-opens java.base/java.lang=ALL-UNNAMED -version ; then - DEFAULT_JVM_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED $DEFAULT_JVM_OPTS" -fi +# NOTE: commented out as this doesn't work with openjdk-8 +# if $JAVACMD --add-opens java.base/java.lang=ALL-UNNAMED -version ; then +# DEFAULT_JVM_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED $DEFAULT_JVM_OPTS" +# fi eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -- To view, visit https://gerrit.osmocom.org/c/aram-applet/+/39583?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: aram-applet Gerrit-Branch: master Gerrit-Change-Id: I788e44cfe20ba6a331e8247677ecb5a526c433f7 Gerrit-Change-Number: 39583 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log