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

[S] Change in osmo-ttcn3-hacks[master]: bts: BTS_Tests.cfg: remove commented out params

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39809?usp=email ) Change subject: bts: BTS_Tests.cfg: remove commented out params ...................................................................... bts: BTS_Tests.cfg: remove commented out params ... most of them are personal stuff. Change-Id: I892ae9003082da78ba41df55b6fb56ff4aae5526 --- M bts/BTS_Tests.cfg 1 file changed, 0 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/09/39809/1 diff --git a/bts/BTS_Tests.cfg b/bts/BTS_Tests.cfg index fb78eba..b37bc2f 100644 --- a/bts/BTS_Tests.cfg +++ b/bts/BTS_Tests.cfg @@ -9,22 +9,10 @@ [LOGGING] [TESTPORT_PARAMETERS] -#*.BTSVTY.CTRL_HOSTNAME := "10.9.1.191" # sysmoBTS Max -#*.BTSVTY.CTRL_HOSTNAME := "10.9.1.162" # sysmoBTS Pau -#*.BTSVTY.CTRL_HOSTNAME := "192.168.100.130" # sysmoBTS home -#*.BTSVTY.CTRL_HOSTNAME := "127.0.0.20" # osmo-bts-trx -#*.BSCVTY.CTRL_HOSTNAME := "127.0.0.11" # osmo-bsc [MODULE_PARAMETERS] L1CTL_PortType.m_l1ctl_sock_path := "/tmp/osmocom_l2" -#BTS_Tests.mp_rsl_ip := "10.9.1.2" # office -#BTS_Tests.mp_rsl_ip := "192.168.100.2" # home -#BTS_Tests.mp_rsl_ip := "127.0.0.10" BTS_Tests.mp_pcu_socket := "/tmp/pcu_sock" -#BTS_Tests.mp_bts_trxc_ip := "127.0.0.21" -#BTS_Tests.mp_ctrl_ip := "127.0.0.20" -#BTS_Tests_OML.mp_oml_ip := "192.168.102.239" # home -#BTS_Tests_OML.mp_oml_port := 3002 BTS_Tests.mp_l1_supports_gprs := true # real BTS / RF @@ -32,8 +20,6 @@ #BTS_Tests.mp_tolerance_rxlev := 10; #BTS_Tests.mp_tolerance_rxqual := 1; -BTS_Tests_OML.mp_pcu_socket := "/tmp/pcu_sock" - [MAIN_CONTROLLER] [EXECUTE] -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39809?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I892ae9003082da78ba41df55b6fb56ff4aae5526 Gerrit-Change-Number: 39809 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

3 months, 3 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/gerrit-lint: run in docker

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/39794?usp=email ) Change subject: jobs/gerrit-lint: run in docker ...................................................................... jobs/gerrit-lint: run in docker Run the linting scripts in docker, so we can make use of additional programs like clang-format without installing them on the jenkins node directly. Change-Id: I17d2e538f1f9fb69f298ac223bc293570db90a83 --- M contrib/known_hosts M jobs/gerrit-lint.yml M lint/lint_diff.sh 3 files changed, 18 insertions(+), 2 deletions(-) Approvals: pespin: 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/known_hosts b/contrib/known_hosts index de29e93..5be5736 100644 --- a/contrib/known_hosts +++ b/contrib/known_hosts @@ -1,3 +1,4 @@ [ftp.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9 [ftp.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54= [ftp.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX +[gerrit.osmocom.org]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDI4wZwtcGz2V98iZWWEtsA162PolLtgQTBjnC14ONzZGQkTh9bTPsoSxnM5TKOm4F2bzq7gb+Qrsj4ZECD19qztmD37kMP9jn7/2i1V8oLAy9ojyklXAdBVTliQteVI7ieDOyKCnGbszvFWXY2isoO1k7yJLv0QyL7F5AuZlxeHw== diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml index a607268..661a600 100644 --- a/jobs/gerrit-lint.yml +++ b/jobs/gerrit-lint.yml @@ -48,8 +48,22 @@ osmo-ci git -C osmo-ci log --oneline - cd code-from-gerrit - ../osmo-ci/lint/lint_diff.sh HEAD~1 + docker run \ + --rm \ + -e GERRIT_HOST=$GERRIT_HOST \ + -e GERRIT_PORT=$GERRIT_PORT \ + -e GERRIT_PROJECT=$GERRIT_PROJECT \ + -e GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER \ + -e GERRIT_PATCHSET_NUMBER=$GERRIT_PATCHSET_NUMBER \ + -e JENKINS_HOME=1 \ + -e SSH_AUTH_SOCK=/ssh-agent \ + -u build \ + -v $(readlink -f $SSH_AUTH_SOCK):/ssh-agent \ + -v ./code-from-gerrit:/build/code-from-gerrit \ + -v ./osmo-ci:/build/osmo-ci \ + -w /build/code-from-gerrit \ + "$USER/debian-bookworm-build" \ + /build/osmo-ci/lint/lint_diff.sh HEAD~1 wrappers: - ansicolor: diff --git a/lint/lint_diff.sh b/lint/lint_diff.sh index 662bdd3..5ec26a5 100755 --- a/lint/lint_diff.sh +++ b/lint/lint_diff.sh @@ -63,6 +63,7 @@ "$BUILD_URL" # Apply as review in gerrit ssh \ + -o UserKnownHostsFile=$SCRIPT_DIR/../contrib/known_hosts \ -p "$GERRIT_PORT" \ -l jenkins \ "$GERRIT_HOST" \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39794?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: I17d2e538f1f9fb69f298ac223bc293570db90a83 Gerrit-Change-Number: 39794 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-Reviewer: pespin <pespin(a)sysmocom.de>

3 months, 3 weeks

1
0
0 0

[M] Change in osmo-ci[master]: lint/lint_diff: make use of shell functions

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/39795?usp=email ) Change subject: lint/lint_diff: make use of shell functions ...................................................................... lint/lint_diff: make use of shell functions Prepare to add more logic to this file by first moving existing code blocks into functions. Change-Id: If884f51f20e794397ee0fecff0cf1f958957da05 --- M lint/lint_diff.sh 1 file changed, 77 insertions(+), 60 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/lint/lint_diff.sh b/lint/lint_diff.sh index 5ec26a5..9458ca7 100755 --- a/lint/lint_diff.sh +++ b/lint/lint_diff.sh @@ -3,77 +3,94 @@ COMMIT="$1" GIT_DIR="$(git rev-parse --show-toplevel 2>/dev/null || true)" SCRIPT_DIR="$(dirname "$(realpath "$0")")" - -if [ -z "$GIT_DIR" ]; then - echo "ERROR: path is not a git repository: $PWD" - exit 1 -fi - -if [ -z "$COMMIT" ]; then - # Clean worktree: diff last commit against the one before - COMMIT="HEAD~1" - - if [ -n "$(git status --porcelain)" ]; then - # Dirty worktree: diff uncommitted changes against last commit - COMMIT="HEAD" - fi -fi - ERROR=0 -echo "Running docker_run_rm.sh on the whole tree..." -echo -if ! "$SCRIPT_DIR"/docker_run_rm.sh; then - ERROR=1 -fi +check_git_dir() { + if [ -z "$GIT_DIR" ]; then + echo "ERROR: path is not a git repository: $PWD" + exit 1 + fi +} -echo "Running checkpatch on 'git diff $COMMIT'..." -echo -if ! git diff -U0 "$COMMIT" | "$SCRIPT_DIR/checkpatch/checkpatch_osmo.sh" - \ - --color=always \ - --mailback \ - --show-types \ - --showfile \ - --terse -then - ERROR=1 -fi +set_commit() { + if [ -z "$COMMIT" ]; then + # Clean worktree: diff last commit against the one before + COMMIT="HEAD~1" + if [ -n "$(git status --porcelain)" ]; then + # Dirty worktree: diff uncommitted changes against last commit + COMMIT="HEAD" + fi + fi +} -if [ "$ERROR" = 1 ]; then +test_docker_run_rm() { + echo "Running docker_run_rm.sh on the whole tree..." + echo + if ! "$SCRIPT_DIR"/docker_run_rm.sh; then + ERROR=1 + fi +} + +test_checkpatch() { + echo "Running checkpatch on 'git diff $COMMIT'..." + echo + if ! git diff -U0 "$COMMIT" | "$SCRIPT_DIR/checkpatch/checkpatch_osmo.sh" - \ + --color=always \ + --mailback \ + --show-types \ + --showfile \ + --terse + then + ERROR=1 + fi +} + +show_error() { echo echo "Please fix the linting errors above. More information:" echo "https://osmocom.org/projects/cellular-infrastructure/wiki/Linting" echo +} +send_review_comments() { + echo "Leaving review comments in gerrit..." + set -x + + # Run again, but in the proper format for checkpatch_json.py + # and store the output in a file + git diff -U0 "$COMMIT" | "$SCRIPT_DIR/checkpatch/checkpatch_osmo.sh" \ + > ../checkpatch_output || true + cd .. + # Convert to gerrit review format + "$SCRIPT_DIR/checkpatch/checkpatch_json.py" \ + checkpatch_output \ + gerrit_report.json \ + "$BUILD_TAG" \ + "$BUILD_URL" + # Apply as review in gerrit + ssh \ + -o UserKnownHostsFile=$SCRIPT_DIR/../contrib/known_hosts \ + -p "$GERRIT_PORT" \ + -l jenkins \ + "$GERRIT_HOST" \ + gerrit \ + review \ + --project "$GERRIT_PROJECT" \ + "$GERRIT_CHANGE_NUMBER,$GERRIT_PATCHSET_NUMBER" \ + --json \ + < gerrit_report.json +} + +check_git_dir +set_commit +test_docker_run_rm +test_checkpatch + +if [ "$ERROR" = 1 ]; then + show_error if [ -n "$JENKINS_HOME" ]; then - echo "Leaving review comments in gerrit..." - set -x - - # Run again, but in the proper format for checkpatch_json.py - # and store the output in a file - git diff -U0 "$COMMIT" | "$SCRIPT_DIR/checkpatch/checkpatch_osmo.sh" \ - > ../checkpatch_output || true - cd .. - # Convert to gerrit review format - "$SCRIPT_DIR/checkpatch/checkpatch_json.py" \ - checkpatch_output \ - gerrit_report.json \ - "$BUILD_TAG" \ - "$BUILD_URL" - # Apply as review in gerrit - ssh \ - -o UserKnownHostsFile=$SCRIPT_DIR/../contrib/known_hosts \ - -p "$GERRIT_PORT" \ - -l jenkins \ - "$GERRIT_HOST" \ - gerrit \ - review \ - --project "$GERRIT_PROJECT" \ - "$GERRIT_CHANGE_NUMBER,$GERRIT_PATCHSET_NUMBER" \ - --json \ - < gerrit_report.json + send_review_comments fi - exit 1 fi -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39795?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: If884f51f20e794397ee0fecff0cf1f958957da05 Gerrit-Change-Number: 39795 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 months, 3 weeks

1
0
0 0

[S] Change in osmo-ci[master]: lint/lint_diff: run clang-format if config was found

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/39796?usp=email ) Change subject: lint/lint_diff: run clang-format if config was found ...................................................................... lint/lint_diff: run clang-format if config was found The osmo-asf4-dfu and osmo-ccid-firmware now have clang-format configs. Adjust the lint script to run clang-format if such a config is found in the repository for which the lint script is running. Change-Id: Ie210966ebfbada43dd8507b9b48218df4925820d --- M lint/lint_diff.sh 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/lint/lint_diff.sh b/lint/lint_diff.sh index 9458ca7..60fd8b1 100755 --- a/lint/lint_diff.sh +++ b/lint/lint_diff.sh @@ -46,6 +46,25 @@ fi } +test_clang_format() { + if ! [ -e ".clang-format" ] || ! command -v clang-format >/dev/null; then + return + fi + + echo "Running clang-format on 'git diff $COMMIT'..." + echo + + # Run clang-format-diff and colorize its output + local diff="$(git diff -U0 --relative "$COMMIT" \ + | clang-format-diff -p1 \ + | sed 's/^-/\x1b[41m-/;s/^+/\x1b[42m+/;s/^@/\x1b[34m@/;s/$/\x1b[0m/')" + + if ! [ -z "$diff" ]; then + ERROR=1 + echo "$diff" + fi +} + show_error() { echo echo "Please fix the linting errors above. More information:" @@ -86,6 +105,7 @@ set_commit test_docker_run_rm test_checkpatch +test_clang_format if [ "$ERROR" = 1 ]; then show_error -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39796?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: Ie210966ebfbada43dd8507b9b48218df4925820d Gerrit-Change-Number: 39796 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 months, 3 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: lint/lint_diff: allow skipping with OSMO_LINT=0

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/39797?usp=email ) Change subject: lint/lint_diff: allow skipping with OSMO_LINT=0 ...................................................................... lint/lint_diff: allow skipping with OSMO_LINT=0 When this script is set as pre-commit hook, it can be useful to skip the linter with this env var to make a commit that intentionally does not pass the linter (e.g. to test if it will be caught in gerrit + jenkins). There is also "git commit --no-verify", but with that the hook that applies the Change-Id does not run. Change-Id: Ia4563c13d9916a879a1e8afeacad8c541662adaa --- M lint/lint_diff.sh 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/lint/lint_diff.sh b/lint/lint_diff.sh index 60fd8b1..4b95b9f 100755 --- a/lint/lint_diff.sh +++ b/lint/lint_diff.sh @@ -5,6 +5,11 @@ SCRIPT_DIR="$(dirname "$(realpath "$0")")" ERROR=0 +if [ "$OSMO_LINT" = 0 ]; then + echo "Skipping lint_diff.sh (OSMO_LINT=0)" + exit 0 +fi + check_git_dir() { if [ -z "$GIT_DIR" ]; then echo "ERROR: path is not a git repository: $PWD" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39797?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: Ia4563c13d9916a879a1e8afeacad8c541662adaa Gerrit-Change-Number: 39797 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 months, 3 weeks

1
0
0 0

[S] Change in osmo-ci[master]: lint/lint_diff: run clang-format if config was found

by osmith

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/39796?usp=email ) Change subject: lint/lint_diff: run clang-format if config was found ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39796?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: Ie210966ebfbada43dd8507b9b48218df4925820d Gerrit-Change-Number: 39796 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Mar 2025 12:35:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 3 weeks

1
0
0 0

[M] Change in osmo-ci[master]: lint/lint_diff: make use of shell functions

by osmith

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/39795?usp=email ) Change subject: lint/lint_diff: make use of shell functions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39795?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: If884f51f20e794397ee0fecff0cf1f958957da05 Gerrit-Change-Number: 39795 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Mar 2025 12:35:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 3 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/gerrit-lint: run in docker

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/39794?usp=email ) Change subject: jobs/gerrit-lint: run in docker ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39794?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: I17d2e538f1f9fb69f298ac223bc293570db90a83 Gerrit-Change-Number: 39794 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Mar 2025 12:35:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 3 weeks

1
0
0 0

[S] Change in osmo-ccid-firmware[master]: sysmoOCTSIM/README: Describe how to build matching libosmocore

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39789?usp=email ) Change subject: sysmoOCTSIM/README: Describe how to build matching libosmocore ...................................................................... sysmoOCTSIM/README: Describe how to build matching libosmocore we currently require a libosmocore that's cross-compiled for this specific embedded target. This information was so far hidden in contrib/jenkins.sh - let's expose it to README.md (slightly modified command to install it to /usr/local/arm-none-eabi) Change-Id: I3392d134ed75dbdd558643aac6d58407e00d23ba --- M sysmoOCTSIM/README.md 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/sysmoOCTSIM/README.md b/sysmoOCTSIM/README.md index 1927255..3eae229 100644 --- a/sysmoOCTSIM/README.md +++ b/sysmoOCTSIM/README.md @@ -24,7 +24,16 @@ GNU make and the arm-none-eabi-gcc compiler are required to build the firmware. -The compile the firmware, run the following commands: +Also, you will need a libosmocore built for arm-none-eabi installed to /usr/local/arm-none-eabi + +You can use the following commands (in the libosmocore directory) to build + +``` +./configure --prefix=/usr/local/arm-none-eabi --enable-static --host=arm-none-eabi --enable-embedded --disable-log-macros --disable-doxygen --disable-shared --disable-pseudotalloc --disable-libsctp --disable-libusb --disable-gb --enable-external-tests CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -mthumb -Os -mlong-calls -g3 -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -I /my/path/to/osmo-ccid-firmware/sysmoOCTSIM -Wno-error=format" CPPFLAGS="-D__thread=''" +make install +``` + +To subsequently compile the firmware, run the following commands (in osmo-ccid-firmware): ``` cd sysmoOCTSIM/gcc -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39789?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: I3392d134ed75dbdd558643aac6d58407e00d23ba Gerrit-Change-Number: 39789 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 months, 3 weeks

1
0
0 0

[XS] Change in osmo-ccid-firmware[master]: ccid_proto.h: Add USB_CLASS_CCID dfefinition

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39791?usp=email ) Change subject: ccid_proto.h: Add USB_CLASS_CCID dfefinition ...................................................................... ccid_proto.h: Add USB_CLASS_CCID dfefinition Change-Id: I587475fcfb0f4e6fda94cf154edba90b7be6d02e --- M ccid_common/ccid_proto.h 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ccid_common/ccid_proto.h b/ccid_common/ccid_proto.h index 1c6dd07..e26a051 100644 --- a/ccid_common/ccid_proto.h +++ b/ccid_common/ccid_proto.h @@ -21,6 +21,8 @@ #include <stdint.h> #include <osmocom/core/utils.h> +#define USB_CLASS_CCID 11 + /* Identifies the length of type of subordinate descriptors of a CCID device * Table 5.1-1 Smart Card Device Class descriptors */ struct usb_ccid_class_descriptor { -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39791?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: I587475fcfb0f4e6fda94cf154edba90b7be6d02e Gerrit-Change-Number: 39791 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

3 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2025