- gerrit-log - lists.osmocom.org

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

by osmith

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/47/40347/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100644 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: newchange Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I8bb2af7ffb902fd690e83e36739c2b4415b9ab80 Gerrit-Change-Number: 40347 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month

1
0
0 0

[XS] Change in pysim[master]: es2p.py: also allow 18 digit ICCID

by laforge

Attention is currently required from: neels. laforge has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/pysim/+/40341?usp=email ) Change subject: es2p.py: also allow 18 digit ICCID ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: why would 18 digits be permitted? According to the wikpedia "SIM card" page, *In practice, this means that on GSM cards there are 20-digit (19+1) and 19-digit (18+1) ICCIDs in use*. E.118 actually doesn't really specify a minimum length. It just states that the IIN at the beginning is variable-length (max 7 digits) and there are a variable number of account identification numbers following it up to the max. length of 19 digits. GSM Phase 1 violated that max-19 by using 20 digits. So I think we should either keep it 19-or-20 digits [practical] or allow anything up to 20 digits [narrow reading of E.118 plus phase1 compat]. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40341?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iaa6e710132e3f4c6cecc5ff786922f6c0fcfb54e Gerrit-Change-Number: 40341 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 May 2025 09:12:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 month

1
0
0 0

[XS] Change in docker-playground[master]: debian-bookworm-erlang: add libnftables-dev

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/40346?usp=email ) Change subject: debian-bookworm-erlang: add libnftables-dev ...................................................................... debian-bookworm-erlang: add libnftables-dev Change-Id: I08e08954dbf90f6548d817e0d179cc1bfbe6f315 Related: osmo-s1gw.git I498d2854447a2d53d2abddd38652f3e2bbb1fbdd Related: SYS#7307 --- M debian-bookworm-erlang/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian-bookworm-erlang/Dockerfile b/debian-bookworm-erlang/Dockerfile index 60e7583..4de9485 100644 --- a/debian-bookworm-erlang/Dockerfile +++ b/debian-bookworm-erlang/Dockerfile @@ -37,6 +37,7 @@ RUN set -x && \ apt-get update && \ apt-get install -y --no-install-recommends \ + libnftables-dev \ libpcap-dev \ libsctp1 \ && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40346?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I08e08954dbf90f6548d817e0d179cc1bfbe6f315 Gerrit-Change-Number: 40346 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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>

1 month

1
0
0 0

[XS] Change in docker-playground[master]: debian-bookworm-erlang: add libnftables-dev

by laforge

Attention is currently required from: fixeria, osmith, pespin. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/docker-playground/+/40346?usp=email ) Change subject: debian-bookworm-erlang: add libnftables-dev ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40346?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I08e08954dbf90f6548d817e0d179cc1bfbe6f315 Gerrit-Change-Number: 40346 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 May 2025 09:07:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month

1
0
0 0

[XS] Change in docker-playground[master]: debian-bookworm-erlang: add libnftables-dev

by laforge

Attention is currently required from: fixeria, osmith, pespin. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/docker-playground/+/40346?usp=email ) Change subject: debian-bookworm-erlang: add libnftables-dev ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40346?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I08e08954dbf90f6548d817e0d179cc1bfbe6f315 Gerrit-Change-Number: 40346 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 May 2025 09:07:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month

1
0
0 0

[XS] Change in docker-playground[master]: debian-bookworm-erlang: add libnftables-dev

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/40346?usp=email ) Change subject: debian-bookworm-erlang: add libnftables-dev ...................................................................... debian-bookworm-erlang: add libnftables-dev Change-Id: I08e08954dbf90f6548d817e0d179cc1bfbe6f315 Related: osmo-s1gw.git I498d2854447a2d53d2abddd38652f3e2bbb1fbdd Related: SYS#7307 --- M debian-bookworm-erlang/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/46/40346/1 diff --git a/debian-bookworm-erlang/Dockerfile b/debian-bookworm-erlang/Dockerfile index 60e7583..4de9485 100644 --- a/debian-bookworm-erlang/Dockerfile +++ b/debian-bookworm-erlang/Dockerfile @@ -37,6 +37,7 @@ RUN set -x && \ apt-get update && \ apt-get install -y --no-install-recommends \ + libnftables-dev \ libpcap-dev \ libsctp1 \ && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40346?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: I08e08954dbf90f6548d817e0d179cc1bfbe6f315 Gerrit-Change-Number: 40346 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 month, 1 week

1
0
0 0

[S] Change in ...osmo-epdg[master]: s2b: add PDN type to the create session request

by fixeria

Attention is currently required from: lynxis lazus. fixeria has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37903?usp=email ) Change subject: s2b: add PDN type to the create session request ...................................................................... Patch Set 1: (3 comments) File src/epdg_gtpc_s2b.erl: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37903/comment/4e76acab_26bc… : PS1, Line 87: atom(). It's probably a good idea to define possible atom values here? ``` -type pdn_type() :: ipv4 | ipv6 | ipv4v6. ``` This allows dializer to catch typos in atoms. https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37903/comment/c8dd76a5_7f9e… : PS1, Line 537: <<0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0>> Not critical, but you could do this as follows: ``` << 16#00:(8 * 4) >> %% for ipv4 << 16#00:(8 * 16) >> %% for ipv6 << 16#00:(8 * 20) >> %% for ipv4v6 ``` File src/epdg_ue_fsm.erl: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37903/comment/53e35966_d970… : PS1, Line 70: atom(), You can export `-type pdn_type` from `epdg_gtpc_s2b.erl` and use it here. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37903?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I52c9b2db38489404dbe2aac907089a0a6414c9b0 Gerrit-Change-Number: 37903 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 23 May 2025 06:24:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 month, 1 week

1
0
0 0

[XS] Change in ...osmo-epdg[master]: s2b: add logline on terminating module

by fixeria

Attention is currently required from: lynxis lazus. fixeria has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37902?usp=email ) Change subject: s2b: add logline on terminating module ...................................................................... Patch Set 1: Code-Review-1 (1 comment) File src/epdg_gtpc_s2b.erl: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37902/comment/c2be4cc2_d59c… : PS1, Line 206: State Do we really want/need to log the state here? And why do you log it as `error` given that it's `normal`? -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37902?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I7a3665b0a77ac86bed448a18cf224e2f6954ba73 Gerrit-Change-Number: 37902 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 23 May 2025 06:13:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 month, 1 week

1
0
0 0

[XS] Change in ...osmo-epdg[master]: s2b: when socket opening fails, stop the S2b module

by fixeria

Attention is currently required from: lynxis lazus. fixeria has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37901?usp=email ) Change subject: s2b: when socket opening fails, stop the S2b module ...................................................................... Patch Set 1: Code-Review-1 (1 comment) File src/epdg_gtpc_s2b.erl: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37901/comment/1671b7b2_e945… : PS1, Line 145: {stop, "GTPv2C UDP socket open error: ~w~n", [Reason]} This is not a valid return value for https://www.erlang.org/doc/apps/stdlib/gen_server.html#c:init/1. In the case of `stop`, the tuple must contain two elements (`{stop, Reason}`), not three. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37901?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I49a6a1ec0c938aa70444c19c0b7b644f2e42f1fd Gerrit-Change-Number: 37901 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 23 May 2025 06:10:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 month, 1 week

1
0
0 0

[XS] Change in ...osmo-epdg[master]: s2b: set correct instance values for Bearers

by fixeria

Attention is currently required from: lynxis lazus. fixeria has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37899?usp=email ) Change subject: s2b: set correct instance values for Bearers ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37899/comment/2a876fd6_1c41… : PS1, Line 9: explicit +ly -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37899?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ibce4a2e44a3bb0d7e1d86953a94929242d45a3dd Gerrit-Change-Number: 37899 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 22 May 2025 11:07:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 month, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log