- gerrit-log - lists.osmocom.org

[S] Change in osmo-ci[master]: OBS: add --disable-manuals
by osmith 11 Jun '24

11 Jun '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37174?usp=email ) Change subject: OBS: add --disable-manuals ...................................................................... OBS: add --disable-manuals Allow building binary packages faster by disabling the manuals. We don't need those for the asan repository. Related: OS#5301 Change-Id: I3ff84f26ee6aa53cbcbe2275bedc6b724a461adc --- M scripts/obs/lib/__init__.py M scripts/obs/lib/debian.py M scripts/obs/lib/srcpkg.py 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index 2e59806..66090f2 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -48,6 +48,10 @@ group_pkg.add_argument("-C", "--configure-append", help="add these parameters to the ./configure line" " (e.g. ' --enable-sanitize')") + group_pkg.add_argument("-D", "--disable-manuals", action="store_true", + help="speed up build by removing the" + " osmo-gsm-manuals dependency and not building" + " asciidoc and doxygen manuals") group_git = parser.add_argument_group("git options") group_git.add_argument("-b", "--git-branch", help="instead of using a" diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py index dd85729..efe4ff3 100644 --- a/scripts/obs/lib/debian.py +++ b/scripts/obs/lib/debian.py @@ -153,6 +153,21 @@ f.writelines(lines) +def disable_manuals(project): + """ Disabling manuals speeds up the build time significantly, we don't + need them for e.g. the asan repository. """ + print(f"{project}: disabling manuals") + debian = f"{lib.git.get_repo_path(project)}/debian" + # Remove dependencies + lib.run_cmd(["sed", "-i", "/osmo-gsm-manuals-dev/d", f"{debian}/control"]) + lib.run_cmd(["sed", "-i", "/doxygen/d", f"{debian}/control"]) + # Remove debian/*-doc.install + lib.run_cmd(f"rm -rf {shlex.quote(debian)}/*-doc.install", shell=True) + # debian/rules: remove --enable-manuals/doxygen, add --disable-doxygen + lib.run_cmd(["sed", "-i", "s/--enable-manuals//g", f"{debian}/rules"]) + lib.run_cmd(["sed", "-i", "s/--enable-doxygen//g", f"{debian}/rules"]) + + def build_source_package(project): fix_source_format(project) print(f"{project}: building debian source package") diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index 7701a83..4da6b70 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -207,6 +207,9 @@ if lib.args.configure_append: lib.debian.configure_append(project, lib.args.configure_append) + if lib.args.disable_manuals: + lib.debian.disable_manuals(project) + lib.debian.build_source_package(project) lib.debian.move_files_to_output(project) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37174?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3ff84f26ee6aa53cbcbe2275bedc6b724a461adc Gerrit-Change-Number: 37174 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ci[master]: OBS: fix using --conflict-pkgname
by osmith 11 Jun '24

11 Jun '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37175?usp=email ) Change subject: OBS: fix using --conflict-pkgname ...................................................................... OBS: fix using --conflict-pkgname Use --conflict-pkgname as package name, instead of hardcoding osmocom-$FEED. Fix for: FileNotFoundError: [Errno 2] No such file or directory: '/obs/_cache/osmocom-nightly-asan' Change-Id: I4ddb2e9adc25e7e8e8c9d17236b76d9f2e9c2a9c --- M scripts/obs/lib/metapkg.py M scripts/obs/update_obs_project.py 2 files changed, 35 insertions(+), 20 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/scripts/obs/lib/metapkg.py b/scripts/obs/lib/metapkg.py index 38ed930..8a9922d 100644 --- a/scripts/obs/lib/metapkg.py +++ b/scripts/obs/lib/metapkg.py @@ -7,17 +7,17 @@ import lib.rpm_spec -def get_conflicts(): +def get_conflicts(pkgname): ret = [] for f in lib.config.feeds: - if f == lib.args.feed: + if "osmocom-{f}" == pkgname: continue ret += [f"osmocom-{f}"] return ret -def prepare_source_dir(): - path = f"{lib.config.path_cache}/osmocom-{lib.args.feed}" +def prepare_source_dir(pkgname): + path = f"{lib.config.path_cache}/{pkgname}" if os.path.exists(path): lib.run_cmd(["rm", "-rf", path]) @@ -26,27 +26,27 @@ os.makedirs(f"{path}/contrib") -def generate_debian_pkg(version): +def generate_debian_pkg(pkgname, version): feed = lib.args.feed - path = f"{lib.config.path_cache}/osmocom-{feed}" - conflicts = get_conflicts() + path = f"{lib.config.path_cache}/{pkgname}" + conflicts = get_conflicts(pkgname) with open(f"{path}/debian/control", "w") as f: - f.write(f"Source: osmocom-{feed}\n") + f.write(f"Source: {pkgname}\n") f.write("Section: unknown\n") f.write("Priority: optional\n") f.write("Maintainer: Osmocom OBS scripts <info(a)osmocom.org>\n") f.write("Build-Depends: debhelper (>= 10)\n") f.write("Standards-Version: 3.9.8\n") f.write("\n") - f.write(f"Package: osmocom-{feed}\n") + f.write(f"Package: {pkgname}\n") f.write("Depends: ${misc:Depends}\n") f.write("Architecture: any\n") f.write(f"Conflicts: {', '.join(conflicts)}\n") f.write(f"Description: Dummy package, conflicts with {conflicts}\n") with open(f"{path}/debian/changelog", "w") as f: - f.write(f"osmocom-{feed} ({version}) unstable; urgency=medium\n") + f.write(f"{pkgname} ({version}) unstable; urgency=medium\n") f.write("\n") f.write(f" * Dummy package, which conflicts with: {conflicts}\n") f.write("\n") @@ -64,15 +64,14 @@ f.write("10\n") -def generate_rpm_spec(version): +def generate_rpm_spec(pkgname, version): feed = lib.args.feed - print(f"osmocom-{feed}: generating rpm spec file") - path = (f"{lib.config.path_cache}/osmocom-{feed}/contrib/osmocom-{feed}" - ".spec.in") - conflicts = get_conflicts() + print(f"{pkgname}: generating rpm spec file") + path = f"{lib.config.path_cache}/{pkgname}/contrib/{pkgname}.spec.in" + conflicts = get_conflicts(pkgname) with open(path, "w") as f: - f.write(f"Name: osmocom-{feed}\n") + f.write(f"Name: {pkgname}\n") f.write(f"Version: {version}\n") f.write(f"Summary: Dummy package, conflicts with: {conflicts}\n") f.write("Release: 0\n") @@ -92,8 +91,8 @@ version = conflict_version if conflict_version else "1.0.0" print(f"{pkgname}: generating meta package {version}") - prepare_source_dir() - generate_debian_pkg(version) + prepare_source_dir(pkgname) + generate_debian_pkg(pkgname, version) os.makedirs(lib.get_output_path(pkgname)) lib.remove_cache_extra_files() @@ -101,7 +100,7 @@ lib.debian.build_source_package(pkgname) lib.debian.move_files_to_output(pkgname) - generate_rpm_spec(version) + generate_rpm_spec(pkgname, version) lib.rpm_spec.copy_to_output(pkgname) lib.remove_cache_extra_files() diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index 6f3bffc..08d789d 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -142,7 +142,8 @@ if lib.args.meta: feed = lib.args.feed - build_srcpkg_if_needed(pkgs_remote, f"osmocom-{feed}", True) + metapkg = lib.args.conflict_pkgname or f"osmocom-{feed}" + build_srcpkg_if_needed(pkgs_remote, metapkg, True) for package in packages: build_srcpkg_if_needed(pkgs_remote, package, False) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37175?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4ddb2e9adc25e7e8e8c9d17236b76d9f2e9c2a9c Gerrit-Change-Number: 37175 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in simtrace2[master]: ngff_cardem: cosmetic: fix superflous space
by lynxis lazus 11 Jun '24

11 Jun '24

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/36979?usp=email ) Change subject: ngff_cardem: cosmetic: fix superflous space ...................................................................... ngff_cardem: cosmetic: fix superflous space Change-Id: Ib155d5778a0df7865958ab65fe2ce48b44f4326d --- M firmware/libboard/ngff_cardem/source/board_ngff_cardem.c 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/libboard/ngff_cardem/source/board_ngff_cardem.c b/firmware/libboard/ngff_cardem/source/board_ngff_cardem.c index fea64d3..07ae1af 100644 --- a/firmware/libboard/ngff_cardem/source/board_ngff_cardem.c +++ b/firmware/libboard/ngff_cardem/source/board_ngff_cardem.c @@ -146,8 +146,8 @@ return 0; } - static const Pin deton = {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}; - static const Pin detoff = {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}; +static const Pin deton = {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}; +static const Pin detoff = {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}; void board_set_card_insert(struct cardem_inst *ci, bool card_insert) { -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/36979?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ib155d5778a0df7865958ab65fe2ce48b44f4326d Gerrit-Change-Number: 36979 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in simtrace2[master]: RFC: card emu config: add feature sim polarity
by lynxis lazus 11 Jun '24

11 Jun '24

lynxis lazus has abandoned this change. ( https://gerrit.osmocom.org/c/simtrace2/+/36859?usp=email ) Change subject: RFC: card emu config: add feature sim polarity ...................................................................... Abandoned only a rfc to check the protocol -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/36859?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I36a8acb74ad7616205af68b1626b45ab79d7cb02 Gerrit-Change-Number: 36859 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: abandon

1 0

[S] Change in simtrace2[master]: dissector: add support for sim polarity
by lynxis lazus 11 Jun '24

11 Jun '24

Attention is currently required from: laforge. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/36980?usp=email ) Change subject: dissector: add support for sim polarity ...................................................................... Patch Set 3: (2 comments) Patchset: PS3: > fine with me, but worth fixing the cosmetics. […] Ack File contrib/simtrace.lua: https://gerrit.osmocom.org/c/simtrace2/+/36980/comment/9014bf39_5bcbc9c6 PS3, Line 222: if payload_data:len() >= 4 then : subtree:add(hf_cemu_cfg_slot_mux_nr, payload_data(4,1)); : end : if payload_data:len() >= 5 then : local pres = payload_data(5,1):le_uint(); : subtree:add(hf_cemu_cfg_presence_polarity, payload_data(5,1)); : headerSubtree:add(CEMU_CONFIG_PRES_POL_PRES_H, pres) : headerSubtree:add(CEMU_CONFIG_PRES_POL_VALID, pres) : end > this looks a bit like the original file used space-only indents but you're using tabs now? Replaced tabs vs spaces. -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/36980?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: If3ae350d0f4d737bc9e80c4f5d73cc1a39d076af Gerrit-Change-Number: 36980 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 11 Jun 2024 08:41:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[M] Change in osmo-hnbgw[master]: nft-kpi: remove X34 drifting: adjust delay by elapsed time
by pespin 11 Jun '24

11 Jun '24

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/37188?usp=email ) Change subject: nft-kpi: remove X34 drifting: adjust delay by elapsed time ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/37188?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I04f572890c04a48bb19c59f613a492ef96624baa Gerrit-Change-Number: 37188 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Jun 2024 08:37:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-remsim[master]: remsim_client: add support to set sim presence pin polarity
by lynxis lazus 11 Jun '24

11 Jun '24

Attention is currently required from: laforge. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/36983?usp=email ) Change subject: remsim_client: add support to set sim presence pin polarity ...................................................................... Patch Set 2: (1 comment) File configure.ac: https://gerrit.osmocom.org/c/osmo-remsim/+/36983/comment/85bc73a6_19efac43 PS2, Line 68: 0.9.0) > that version is not yet tagged, is it? The usual way is to add a TODO-RELEASE note to bump the depen […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/36983?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Iaa61967d2e8cd5c2269b73f4e65b42072e0ec513 Gerrit-Change-Number: 36983 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 11 Jun 2024 08:36:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[S] Change in osmo-remsim[master]: remsim_client: add support to set sim presence pin polarity
by lynxis lazus 11 Jun '24

11 Jun '24

Attention is currently required from: lynxis lazus. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-remsim/+/36983?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: remsim_client: add support to set sim presence pin polarity ...................................................................... remsim_client: add support to set sim presence pin polarity The sim presence pin allows the simtrace2 to inform the modem about the presence of the simcard. On a generic simcard slot a button is pressed by the simcard which generate a high or low voltage level. Even there are specifications of minipcie or ngff defining this signal, certain modems don't follow the specification and require a different signal level. Related: SYS#6946 Depends-on: Iacde63e667472a85a5f18cb4ca99dcfa1a84dd59 (simtrace2) Change-Id: Iaa61967d2e8cd5c2269b73f4e65b42072e0ec513 --- M TODO-RELEASE M src/client/Makefile.am M src/client/client.h M src/client/remsim_client_main.c M src/client/user_simtrace2.c 5 files changed, 45 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/83/36983/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/36983?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Iaa61967d2e8cd5c2269b73f4e65b42072e0ec513 Gerrit-Change-Number: 36983 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-hnbgw[master]: nft-kpi: log errors of counter retrieval
by pespin 11 Jun '24

11 Jun '24

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/37187?usp=email ) Change subject: nft-kpi: log errors of counter retrieval ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/37187?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I84340482e4a5bfcac158a21c9378a9511fa5ea10 Gerrit-Change-Number: 37187 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Jun 2024 08:20:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: TC_hnb_disconnected_timeout
by laforge 11 Jun '24

11 Jun '24

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37077?usp=email ) Change subject: hnbgw: TC_hnb_disconnected_timeout ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37077?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibec009203d38f65714561b7c28edbdbd8b34e704 Gerrit-Change-Number: 37077 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Jun 2024 07:18:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log