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

[S] Change in osmo-dev[master]: gen_makefile: use args.jobs directly

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/40351?usp=email ) Change subject: gen_makefile: use args.jobs directly ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40351?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I49d340fdc47e66a9419dbc27f40774c1307f9526 Gerrit-Change-Number: 40351 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: Fri, 23 May 2025 13:48:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month

1
0
0 0

[S] Change in osmo-dev[master]: gen_makefile: remove openbsc support

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/40350?usp=email ) Change subject: gen_makefile: remove openbsc support ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40350?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ia375e32d2e5e9f9d55568b9393b6935c647ec9d0 Gerrit-Change-Number: 40350 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: Fri, 23 May 2025 13:48:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month

1
0
0 0

[S] Change in osmo-dev[master]: ruff: add format exclude block

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/40349?usp=email ) Change subject: ruff: add format exclude block ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40349?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I681627a3271ec65f356249e930323efc9ce0954d Gerrit-Change-Number: 40349 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: Fri, 23 May 2025 13:47:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month

1
0
0 0

[M] Change in osmo-dev[master]: gen_makefile: {make,src}_dir: use absolute paths

by pespin

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/40347?usp=email ) Change subject: gen_makefile: {make,src}_dir: use absolute paths ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40347?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I8bb2af7ffb902fd690e83e36739c2b4415b9ab80 Gerrit-Change-Number: 40347 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 May 2025 13:47:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/gerrit-verifications: run CI for osmo-dev.git

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40360?usp=email ) Change subject: jobs/gerrit-verifications: run CI for osmo-dev.git ...................................................................... jobs/gerrit-verifications: run CI for osmo-dev.git Run linter and pytest scripts for osmo-dev. Related: osmo-dev I8bb2af7ffb902fd690e83e36739c2b4415b9ab80 Change-Id: I170e8913fd47e47120e0dd374c4662e1d2e964a3 --- M jobs/gerrit-verifications.yml 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/60/40360/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 7d90799..fa32dc1 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -260,6 +260,9 @@ pipeline_build: false pipeline_binpkgs: "" + - osmo-dev: + pipeline_binpkgs: "" + - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40360?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: I170e8913fd47e47120e0dd374c4662e1d2e964a3 Gerrit-Change-Number: 40360 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month

1
0
0 0

[XS] Change in osmo-ci[master]: lint: test_ruff: add osmo-dev to format_projects

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40359?usp=email ) Change subject: lint: test_ruff: add osmo-dev to format_projects ...................................................................... lint: test_ruff: add osmo-dev to format_projects Depends: osmo-dev I681627a3271ec65f356249e930323efc9ce0954d Change-Id: Ic8ee81f44f71ebb8606e46b3c00332286a89dae9 --- M lint/lint_diff.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/59/40359/1 diff --git a/lint/lint_diff.sh b/lint/lint_diff.sh index 28bb922..d76d951 100755 --- a/lint/lint_diff.sh +++ b/lint/lint_diff.sh @@ -88,6 +88,7 @@ " local format_projects=" osmo-ttcn3-hacks + osmo-dev osmo-ci " -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40359?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: Ic8ee81f44f71ebb8606e46b3c00332286a89dae9 Gerrit-Change-Number: 40359 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month

1
0
0 0

[XS] Change in docker-playground[master]: debian-bookworm-build: add deps for osmo-dev test

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/40358?usp=email ) Change subject: debian-bookworm-build: add deps for osmo-dev test ...................................................................... debian-bookworm-build: add deps for osmo-dev test Prepare to run new tests for gen_makefile.py in osmo-dev in CI. This requires pytest and open5gs dependencies to pass "meson setup". Related: osmo-dev I8bb2af7ffb902fd690e83e36739c2b4415b9ab80 Change-Id: I528565fe21b5989fff1d1b005e53136af5be429e --- M debian-bookworm-build/Dockerfile 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/58/40358/1 diff --git a/debian-bookworm-build/Dockerfile b/debian-bookworm-build/Dockerfile index 170d363..5b98bef 100644 --- a/debian-bookworm-build/Dockerfile +++ b/debian-bookworm-build/Dockerfile @@ -104,13 +104,16 @@ libgnutls28-dev \ libgps-dev \ libgsm1-dev \ + libidn-dev \ libjansson-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 \ @@ -124,6 +127,7 @@ libsnmp-dev \ libsofia-sip-ua-glib-dev \ libsqlite3-dev \ + libssh-gcrypt-dev \ libssl-dev \ libtalloc-dev \ libtinfo5 \ @@ -132,10 +136,12 @@ libusb-1.0-0-dev \ libusb-dev \ libxml2-utils \ + libyaml-dev \ libzmq3-dev \ locales \ lua-socket \ make \ + meson \ mscgen \ ofono \ openssh-client \ @@ -149,6 +155,7 @@ python3-nwdiag \ python3-pip \ python3-pyflakes \ + python3-pytest \ python3-setuptools \ python3-usb \ python3-yaml \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40358?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: I528565fe21b5989fff1d1b005e53136af5be429e Gerrit-Change-Number: 40358 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month

1
0
0 0

[S] Change in osmo-dev[master]: gen_makefile: remove openbsc support

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/40350?usp=email ) Change subject: gen_makefile: remove openbsc support ...................................................................... gen_makefile: remove openbsc support This makes gen_make simpler. OpenBSC is obsolete since 2017, I think we can safely remove support for it from osmo-dev. Related: openbsc I5d5c0ff386dbc2e7b7dd02d6c33d1f9fec70707b Change-Id: Ia375e32d2e5e9f9d55568b9393b6935c647ec9d0 --- M default.opts M gen_makefile.py M iu.opts D openbsc.deps M sanitize.opts 5 files changed, 0 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/50/40350/1 diff --git a/default.opts b/default.opts index 68a8c23..4b9e068 100644 --- a/default.opts +++ b/default.opts @@ -1,4 +1,3 @@ osmo-msc --enable-smpp -openbsc --enable-smpp --enable-osmo-bsc --enable-nat nftables --with-json strongswan-epdg --enable-osmo-epdg --enable-save-keys --enable-eap-aka-3gpp --enable-eap-aka-3gpp2 diff --git a/gen_makefile.py b/gen_makefile.py index 44c257d..550c722 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -442,9 +442,6 @@ def gen_make(proj, deps, configure_opts, jobs, make_dir, src_dir, build_dir, url, push_url, sudo_make_install, no_ldconfig, ldconfig_without_sudo, make_check): src_proj = os.path.join(src_dir, proj) - if proj == 'openbsc': - src_proj = os.path.join(src_proj, 'openbsc') - src_proj_copy = gen_src_proj_copy(src_proj, make_dir, proj) build_proj = os.path.join(build_dir, proj) diff --git a/iu.opts b/iu.opts index bb58742..a96a1bc 100644 --- a/iu.opts +++ b/iu.opts @@ -1,3 +1,2 @@ osmo-msc --enable-iu osmo-sgsn --enable-iu -openbsc --enable-iu diff --git a/openbsc.deps b/openbsc.deps deleted file mode 100644 index f49e6a1..0000000 --- a/openbsc.deps +++ /dev/null @@ -1,8 +0,0 @@ -# project build these first -libosmocore -libosmo-abis libosmocore -libosmo-netif libosmo-abis -libsmpp34 -osmo-ggsn libosmocore -osmo-sgsn libosmo-netif osmo-ggsn -openbsc libosmo-netif libsmpp34 diff --git a/sanitize.opts b/sanitize.opts index 72a1d69..0ef0a8c 100644 --- a/sanitize.opts +++ b/sanitize.opts @@ -13,7 +13,6 @@ osmo-mgw --enable-sanitize osmo-msc --enable-sanitize osmo-sgsn --enable-sanitize -openbsc --enable-sanitize osmo-sip-connector --enable-sanitize osmo-pcu --enable-sanitize osmo-bts --enable-sanitize -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40350?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ia375e32d2e5e9f9d55568b9393b6935c647ec9d0 Gerrit-Change-Number: 40350 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month

1
0
0 0

[S] Change in osmo-dev[master]: gen_makefile: use args.jobs directly

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/40351?usp=email ) Change subject: gen_makefile: use args.jobs directly ...................................................................... gen_makefile: use args.jobs directly Make the code easier to follow by not passing unmodified or slightly modified argparse parameters as function arguments through multiple functions. Access them from "args" directly. The following patches make similar adjustments for other parameters. Change-Id: I49d340fdc47e66a9419dbc27f40774c1307f9526 --- M gen_makefile.py 1 file changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/51/40351/1 diff --git a/gen_makefile.py b/gen_makefile.py index 550c722..db82c8f 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -308,7 +308,7 @@ else: assert False, f"unknown buildsystem: {buildsystem}" -def gen_makefile_build(proj, distclean_cond, build_proj, docker_cmd, jobs, +def gen_makefile_build(proj, distclean_cond, build_proj, docker_cmd, check, src_proj, update_src_copy_cmd): buildsystem = projects_buildsystems.get(proj, "autotools") @@ -318,7 +318,7 @@ if {distclean_cond}; then $(MAKE) {proj}-distclean .make.{proj}.configure; fi @echo "\\n\\n\\n===== $@\\n" {update_src_copy_cmd} - {docker_cmd}$(MAKE) -C {build_proj} -j {jobs} {check} + {docker_cmd}$(MAKE) -C {build_proj} -j {args.jobs} {check} sync touch $@ ''' @@ -330,7 +330,7 @@ return f''' .make.{proj}.build: .make.{proj}.configure $({proj}_files) @echo "\\n\\n\\n===== $@\\n" - {docker_cmd}meson compile -C {build_proj} -j {jobs} + {docker_cmd}meson compile -C {build_proj} -j {args.jobs} {test_line} sync touch $@ @@ -440,7 +440,7 @@ return src_proj return os.path.join(make_dir, "src_copy", proj) -def gen_make(proj, deps, configure_opts, jobs, make_dir, src_dir, build_dir, url, push_url, sudo_make_install, no_ldconfig, ldconfig_without_sudo, make_check): +def gen_make(proj, deps, configure_opts, make_dir, src_dir, build_dir, url, push_url, sudo_make_install, no_ldconfig, ldconfig_without_sudo, make_check): src_proj = os.path.join(src_dir, proj) src_proj_copy = gen_src_proj_copy(src_proj, make_dir, proj) @@ -512,7 +512,6 @@ distclean_cond, build_proj, docker_cmd, - jobs, check, src_proj_copy, update_src_copy_cmd)} @@ -690,7 +689,7 @@ all_config_opts = [] all_config_opts.extend(configure_opts.get('ALL') or []) all_config_opts.extend(configure_opts.get(proj) or []) - content += gen_make(proj, deps, all_config_opts, args.jobs, + content += gen_make(proj, deps, all_config_opts, make_dir, src_dir, build_dir, args.url, args.push_url, args.sudo_make_install, args.no_ldconfig, args.ldconfig_without_sudo, args.make_check) -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40351?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I49d340fdc47e66a9419dbc27f40774c1307f9526 Gerrit-Change-Number: 40351 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month

1
0
0 0

[S] Change in osmo-dev[master]: gen_makefile: use args.url, args.push_url directly

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/40352?usp=email ) Change subject: gen_makefile: use args.url, args.push_url directly ...................................................................... gen_makefile: use args.url, args.push_url directly Change-Id: If878694d4c8477140b69b3c15dd65a4d9d28b1e3 --- M gen_makefile.py 1 file changed, 5 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/52/40352/1 diff --git a/gen_makefile.py b/gen_makefile.py index db82c8f..02ac203 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -178,7 +178,7 @@ return {} return dict(read_projects_deps(path)) -def gen_makefile_clone(proj, src, src_proj, url, push_url, update_src_copy_cmd): +def gen_makefile_clone(proj, src, src_proj, update_src_copy_cmd): if proj == "osmocom-bb_layer23": return f''' .make.{proj}.clone: .make.osmocom-bb.clone @@ -219,8 +219,8 @@ url = projects_urls[proj] cmd_set_push_url = "true" else: - url = f"{url}/{proj}" - push_url = f"{push_url}/{proj}" + url = f"{args.url}/{proj}" + push_url = f"{args.push_url or args.url}/{proj}" cmd_set_push_url = f'git -C "{src}/{proj}" remote set-url --push origin "{push_url}"' cmd_clone = f'git -C {src} clone --recurse-submodules "{url}" "{proj}"' @@ -440,7 +440,7 @@ return src_proj return os.path.join(make_dir, "src_copy", proj) -def gen_make(proj, deps, configure_opts, make_dir, src_dir, build_dir, url, push_url, sudo_make_install, no_ldconfig, ldconfig_without_sudo, make_check): +def gen_make(proj, deps, configure_opts, make_dir, src_dir, build_dir, sudo_make_install, no_ldconfig, ldconfig_without_sudo, make_check): src_proj = os.path.join(src_dir, proj) src_proj_copy = gen_src_proj_copy(src_proj, make_dir, proj) @@ -448,8 +448,6 @@ build_to_src = os.path.relpath(src_proj_copy, build_proj) build_proj = os.path.relpath(build_proj, make_dir) - push_url = push_url or url - if configure_opts: configure_opts_str = ' '.join(configure_opts) else: @@ -488,8 +486,6 @@ {gen_makefile_clone(proj, src_dir, src_proj, - url, - push_url, update_src_copy_cmd)} {gen_makefile_autoconf(proj, @@ -690,7 +686,7 @@ all_config_opts.extend(configure_opts.get('ALL') or []) all_config_opts.extend(configure_opts.get(proj) or []) content += gen_make(proj, deps, all_config_opts, - make_dir, src_dir, build_dir, args.url, args.push_url, + make_dir, src_dir, build_dir, args.sudo_make_install, args.no_ldconfig, args.ldconfig_without_sudo, args.make_check) -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40352?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: If878694d4c8477140b69b3c15dd65a4d9d28b1e3 Gerrit-Change-Number: 40352 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025