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

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

by osmith

osmith has submitted this change. ( 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(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified 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: merged 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 weeks, 1 day

1
0
0 0

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

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/40347?usp=email ) Change subject: gen_makefile: {make,src}_dir: use absolute paths ...................................................................... gen_makefile: {make,src}_dir: use absolute paths Fix generating wrong relative paths when the make dir (-m) is in the same directory as gen_makefile.py. This was too easy to get wrong with relative paths as shown in the previous patches. I've added tests to mitigate this and switched to absolute paths to make the logic easier to follow. Fix for: $ ./gen_makefile.py -m build $ make -C build libosmocore … cd build/../src/libosmocore; autoreconf -fi /bin/sh: 1: cd: can't cd to build/../src/libosmocore Fixes: 8ea5c0ce ("gen_makefile: fix building open5gs") Change-Id: I8bb2af7ffb902fd690e83e36739c2b4415b9ab80 --- A contrib/jenkins.sh M gen_makefile.py A pytest.ini A tests/test_gen_makefile.py 4 files changed, 78 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 0000000..07c23a5 --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,3 @@ +#!/bin/sh -ex + +pytest -v diff --git a/gen_makefile.py b/gen_makefile.py index c6e4a0b..44c257d 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -437,7 +437,7 @@ def gen_src_proj_copy(src_proj, make_dir, proj): if not is_src_copy_needed(proj): - return os.path.join(make_dir, src_proj) + 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): @@ -445,8 +445,6 @@ if proj == 'openbsc': src_proj = os.path.join(src_proj, 'openbsc') - src = os.path.relpath(src_dir, make_dir) - src_proj = os.path.relpath(src_proj, make_dir) src_proj_copy = gen_src_proj_copy(src_proj, make_dir, proj) build_proj = os.path.join(build_dir, proj) @@ -491,7 +489,7 @@ -and -not -name "config.h" 2>/dev/null) {gen_makefile_clone(proj, - src, + src_dir, src_proj, url, push_url, @@ -559,6 +557,9 @@ opts_names = '+'.join([f.replace('.opts', '') for f in configure_opts_files]) make_dir = 'make-%s' % opts_names +make_dir = os.path.abspath(make_dir) +src_dir = os.path.abspath(args.src_dir) + if not os.path.isdir(make_dir): os.makedirs(make_dir) @@ -693,7 +694,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, args.jobs, - make_dir, args.src_dir, build_dir, args.url, args.push_url, + 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) diff --git a/pytest.ini b/pytest.ini new file mode 100644 index 0000000..15f83b0 --- /dev/null +++ b/pytest.ini @@ -0,0 +1,3 @@ +[pytest] +testpaths = tests +addopts = --tb=short diff --git a/tests/test_gen_makefile.py b/tests/test_gen_makefile.py new file mode 100644 index 0000000..2ae0667 --- /dev/null +++ b/tests/test_gen_makefile.py @@ -0,0 +1,66 @@ +#!/usr/bin/env python3 +# Copyright 2025 sysmocom - s.f.m.c. GmbH +# SPDX-License-Identifier: GPL-3.0-or-later +import os +import shlex +import subprocess + +osmo_dev_path = os.path.realpath(os.path.join(__file__, "../../")) + + +def run_cmd(cmd, *args, **kwargs): + print(f"+ {cmd}") + return subprocess.run(cmd, check=True, *args, **kwargs) + + +def run_make_regen_2x(cwd): + """The "make regen" command regenerates the Makefile. Ensure that this + works twice in a row.""" + run_cmd(["make", "regen"], cwd=cwd) + run_cmd(["make", "regen"], cwd=cwd) + + +def put_gen_makefile_into_tmp_path(tmp_path): + """Ensure running gen_makefile.py -m=<relative path> works as expected.""" + run_cmd(f"cp -v *.* {shlex.quote(str(tmp_path))}", cwd=osmo_dev_path, shell=True) + run_cmd(["ln", "-s", os.path.join(osmo_dev_path, "src"), os.path.join(tmp_path, "src")]) + + +def test_make_libosmocore_autoconf(tmp_path): + run_cmd(["./gen_makefile.py", "default.opts", "iu.opts", "no_dahdi.opts", "-m", tmp_path], cwd=osmo_dev_path) + run_cmd(["make", ".make.libosmocore.autoconf"], cwd=tmp_path) + run_make_regen_2x(tmp_path) + + +def test_make_libosmocore_autoconf_src_copy(tmp_path): + run_cmd(["./gen_makefile.py", "-m", tmp_path, "--autoreconf-in-src-copy"], cwd=osmo_dev_path) + run_cmd(["make", ".make.libosmocore.autoconf"], cwd=tmp_path) + run_make_regen_2x(tmp_path) + + +def test_make_libosmocore_autoconf_relative_makedir(tmp_path): + put_gen_makefile_into_tmp_path(tmp_path) + run_cmd(["./gen_makefile.py", "-m", "make"], cwd=tmp_path) + make_path = os.path.join(tmp_path, "make") + run_cmd(["make", ".make.libosmocore.autoconf"], cwd=make_path) + run_make_regen_2x(make_path) + + +def test_make_libosmocore_autoconf_relative_makedir_src_copy(tmp_path): + put_gen_makefile_into_tmp_path(tmp_path) + run_cmd(["./gen_makefile.py", "-m", "make", "--autoreconf-in-src-copy"], cwd=tmp_path) + make_path = os.path.join(tmp_path, "make") + run_cmd(["make", ".make.libosmocore.autoconf"], cwd=make_path) + run_make_regen_2x(make_path) + + +def test_make_open5gs_configure(tmp_path): + run_cmd(["./gen_makefile.py", "-m", tmp_path], cwd=osmo_dev_path) + run_cmd(["make", ".make.open5gs.configure"], cwd=tmp_path) + run_make_regen_2x(tmp_path) + + +def test_make_open5gs_configure_src_copy(tmp_path): + run_cmd(["./gen_makefile.py", "-m", tmp_path, "--autoreconf-in-src-copy"], cwd=osmo_dev_path) + run_cmd(["make", ".make.open5gs.configure"], cwd=tmp_path) + run_make_regen_2x(tmp_path) -- 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: merged 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 weeks, 1 day

1
0
0 0

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

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/40349?usp=email ) Change subject: ruff: add format exclude block ...................................................................... ruff: add format exclude block Make it possible to run "ruff format --diff" in CI on tests/test_gen_makefile.py and possibly other files in the future. Related: osmo-ci Ic8ee81f44f71ebb8606e46b3c00332286a89dae9 Change-Id: I681627a3271ec65f356249e930323efc9ce0954d --- M .ruff.toml 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/.ruff.toml b/.ruff.toml index 64ca401..6c2df50 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -10,3 +10,13 @@ [lint] # E741: Ambiguous variable name: `l` ignore = ["E741"] + +[format] +exclude = [ + "cgit/osmo-commit-filter.py", + "gen_makefile.py", + "net/fill_config.py", + "net/templates/freeswitch/python/dialplan-dgsm/__init__.py", + "osmo-cn-latest/provision-hlr.py", + "sysmobts-calib.py", +] -- 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: merged 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 weeks, 1 day

1
0
0 0

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

by osmith

osmith has submitted this change. ( 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(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved 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: merged 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> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 weeks, 1 day

1
0
0 0

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

by osmith

osmith has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved 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: merged 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-dev[master]: gen_makefile: use more args vars directly

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/40353?usp=email ) Change subject: gen_makefile: use more args vars directly ...................................................................... gen_makefile: use more args vars directly Use args.no_ldconfig, args.sudo_ldconfig, args.sudo_make_install directly. Change-Id: I050714163bddeb17351f373ea7dd2ffdfa9a0bb5 --- M gen_makefile.py 1 file changed, 9 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/gen_makefile.py b/gen_makefile.py index 02ac203..08d450a 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -349,8 +349,10 @@ else: assert False, f"unknown buildsystem: {buildsystem}" -def gen_makefile_install(proj, docker_cmd, sudo_make_install, build_proj, - no_ldconfig, sudo_ldconfig): +def gen_makefile_install(proj, docker_cmd, build_proj): + no_ldconfig = '#' if args.no_ldconfig else '' + sudo_ldconfig = '' if args.ldconfig_without_sudo else 'sudo ' + sudo_make_install = "sudo " if args.sudo_make_install else "" buildsystem = projects_buildsystems.get(proj, "autotools") if buildsystem == "autotools": return f''' @@ -383,8 +385,8 @@ else: assert False, f"unknown buildsystem: {buildsystem}" -def gen_makefile_reinstall(proj, deps_reinstall, sudo_make_install, - build_proj): +def gen_makefile_reinstall(proj, deps_reinstall, build_proj): + sudo_make_install = "sudo " if args.sudo_make_install else "" return f''' .PHONY: {proj}-reinstall {proj}-reinstall: {deps_reinstall} @@ -440,7 +442,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, sudo_make_install, no_ldconfig, ldconfig_without_sudo, make_check): +def gen_make(proj, deps, configure_opts, make_dir, src_dir, build_dir, make_check): src_proj = os.path.join(src_dir, proj) src_proj_copy = gen_src_proj_copy(src_proj, make_dir, proj) @@ -459,9 +461,6 @@ cflags = 'CFLAGS=-g ' if args.build_debug else '' docker_cmd = f'OSMODEV_PROJECT={proj} {args.docker_cmd} ' if args.docker_cmd else '' check = 'check' if make_check else '' - no_ldconfig = '#' if no_ldconfig else '' - sudo_ldconfig = '' if ldconfig_without_sudo else 'sudo ' - sudo_make_install = 'sudo ' if sudo_make_install else '' update_src_copy_cmd = gen_update_src_copy_cmd(proj, src_dir, make_dir) return f''' @@ -514,14 +513,10 @@ {gen_makefile_install(proj, docker_cmd, - sudo_make_install, - build_proj, - no_ldconfig, - sudo_ldconfig)} + build_proj)} {gen_makefile_reinstall(proj, deps_reinstall, - sudo_make_install, build_proj)} {gen_makefile_clean(proj, build_proj)} @@ -687,8 +682,7 @@ all_config_opts.extend(configure_opts.get(proj) or []) content += gen_make(proj, deps, all_config_opts, make_dir, src_dir, build_dir, - args.sudo_make_install, args.no_ldconfig, - args.ldconfig_without_sudo, args.make_check) + args.make_check) # Replace spaces with tabs to avoid the common pitfall of inserting spaces # instead of tabs by accident into the Makefile (as the python code is indented -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40353?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I050714163bddeb17351f373ea7dd2ffdfa9a0bb5 Gerrit-Change-Number: 40353 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-dev[master]: gen_makefile: remove --auto-distclean parameter

by osmith

Attention is currently required from: neels. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/40355?usp=email ) Change subject: gen_makefile: remove --auto-distclean parameter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40355?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: I28378e6d2cafd209adcfae6b85a032d73ed14cce Gerrit-Change-Number: 40355 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 26 May 2025 07:08:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 weeks, 1 day

1
0
0 0

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

by osmith

osmith 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+2 -- 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 26 May 2025 07:08:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 weeks, 1 day

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: debian: drop unneeded libpcap-dev

by fixeria

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40348?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: debian: drop unneeded libpcap-dev ...................................................................... debian: drop unneeded libpcap-dev Change-Id: I4c152b6f5f517acccfe4aa856447c59eb1212707 --- M debian/control 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/48/40348/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40348?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I4c152b6f5f517acccfe4aa856447c59eb1212707 Gerrit-Change-Number: 40348 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

4 weeks, 1 day

1
0
0 0

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: parse and store Global-ENB-ID IE

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40368?usp=email ) Change subject: s1ap_proxy: parse and store Global-ENB-ID IE ...................................................................... s1ap_proxy: parse and store Global-ENB-ID IE This commit prepares for a follow-up change implementing the NFT-based KPI (GTP-U packets/bytes stats) reporting, which will need the Global-ENB-ID. Change-Id: Icc24d4daf06d161d7b5b386456e8e92ac07d5eba Related: SYS#7307 --- M src/s1ap_proxy.erl 1 file changed, 56 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/68/40368/1 diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 774fc66..bf5f849 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -67,8 +67,12 @@ -type enb_ue_id() :: 0..16#ffffff. -type erab_id() :: 0..16#ff. -type erab_uid() :: {mme_ue_id(), enb_ue_id(), erab_id()}. +-type plmn_id() :: {MCC :: nonempty_string(), + MNC :: nonempty_string()}. -record(proxy_state, {erabs :: dict:dict(), + enb_id :: undefined | non_neg_integer(), + plmn_id :: undefined | plmn_id(), mme_ue_id :: undefined | mme_ue_id(), enb_ue_id :: undefined | enb_ue_id(), erab_id :: undefined | erab_id(), @@ -195,6 +199,35 @@ ok. +%% Parse PLMN-ID as per 3GPP TS 24.008, Figure 10.5.13 +%% | MCC digit 2 | MCC digit 1 | octet 1 +%% | MNC digit 3 | MCC digit 3 | octet 2 +%% | MNC digit 2 | MNC digit 1 | octet 3 +-spec parse_plmn_id(<< _:24 >>) -> plmn_id(). +parse_plmn_id(<< MCC2:4, MCC1:4, + MNC3:4, MCC3:4, + MNC2:4, MNC1:4 >>) -> + MCC = parse_mcc_mnc(MCC1, MCC2, MCC3), + MNC = parse_mcc_mnc(MNC1, MNC2, MNC3), + {MCC, MNC}. + + +-define(UNHEX(H), H + 48). + +parse_mcc_mnc(D1, D2, 16#f) -> + [?UNHEX(D1), ?UNHEX(D2)]; + +parse_mcc_mnc(D1, D2, D3) -> + [?UNHEX(D1), ?UNHEX(D2), ?UNHEX(D3)]. + + +-spec parse_enb_id(tuple()) -> non_neg_integer(). +parse_enb_id({'macroENB-ID', << ID:20 >>}) -> ID; +parse_enb_id({'homeENB-ID', << ID:28 >>}) -> ID; +parse_enb_id({'short-macroENB-ID', << ID:18 >>}) -> ID; +parse_enb_id({'long-macroENB-ID', << ID:21 >>}) -> ID. + + %% Encode an S1AP PDU -spec encode_pdu(s1ap_pdu()) -> {ok, binary()} | {error, {asn1, tuple()}}. @@ -260,6 +293,17 @@ -spec handle_pdu(s1ap_pdu(), proxy_state()) -> {{proxy_action(), s1ap_pdu()}, proxy_state()} | {forward, proxy_state()}. +%% 9.1.8.4 S1 SETUP REQUEST +handle_pdu({initiatingMessage, + #'InitiatingMessage'{procedureCode = ?'id-S1Setup', + value = C0}}, S0) -> + ?LOG_DEBUG("Processing S1 SETUP REQUEST"), + %% there's nothing to patch in this PDU, so we forward it as-is + %% TODO: check result of handle_ies(), inc. ?S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR + {_, S1} = handle_ies(?'id-Global-ENB-ID', + C0#'S1SetupRequest'.protocolIEs, S0), + {forward, S1}; + %% 9.1.3.1 E-RAB SETUP REQUEST handle_pdu({Outcome = initiatingMessage, #'InitiatingMessage'{procedureCode = ?'id-E-RABSetup', @@ -538,6 +582,18 @@ Result :: {handle_ie_result(), proxy_state()}. +handle_ie([?'id-Global-ENB-ID'], + #'Global-ENB-ID'{'pLMNidentity' = PLMNId, + 'eNB-ID' = ENBId} = C, S0) -> + %% store PLMNId/ENBId + %% TODO: use that as a context for logging + S1 = S0#proxy_state{plmn_id = parse_plmn_id(PLMNId), + enb_id = parse_enb_id(ENBId)}, + ?LOG_INFO("Global-ENB-ID: PLMN-ID=~p, eNB-ID=~p", + [S1#proxy_state.plmn_id, + S1#proxy_state.enb_id]), + {{ok, C}, S1}; + %% E-RAB SETUP REQUEST related IEs handle_ie([?'id-E-RABToBeSetupListBearerSUReq'], C, S) -> %% This IE contains a list of BearerSUReq, so patch inner IEs -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40368?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Icc24d4daf06d161d7b5b386456e8e92ac07d5eba Gerrit-Change-Number: 40368 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

4 weeks, 1 day

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025