Attention is currently required from: fixeria.
pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/libosmocore/+/41362?usp=email )
Change subject: tests/testsuite.at: fix invalid if-endif syntax
......................................................................
Patch Set 1:
(1 comment)
File tests/testsuite.at:
https://gerrit.osmocom.org/c/libosmocore/+/41362/comment/28b2f425_f1cd1a79?… :
PS1, Line 86: AT_SKIP_IF([test ! -e $abs_top_builddir/tests/msgfile/msgfile_test])
> Well, we already do this kind of checking in several projects. […]
We seem to be already supporting this with a variable, see libosmocore/tests/testsuite.at:
551:AT_SKIP_IF([ test "$ENABLE_URING" != "yes" || test "$ENABLE_URING_TESTS" != "yes" ])
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41362?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I81e044dc0bda4674c0d0dc46118d46816712a76c
Gerrit-Change-Number: 41362
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
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-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 06 Nov 2025 15:16:21 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>
Attention is currently required from: fixeria, jolly.
pespin has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmo-bsc/+/41361?usp=email )
Change subject: Add ER-GSM band support
......................................................................
Patch Set 1:
(2 comments)
File src/osmo-bsc/system_information.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/41361/comment/b6cafa78_612bde93?usp… :
PS1, Line 548: /* Check presence of R-GSM / E-GSM ARFCNs 940..1023 */
(E)R-GSM
https://gerrit.osmocom.org/c/osmo-bsc/+/41361/comment/e12a0208_9fda10f3?usp… :
PS1, Line 583: if (i >= 940 && min < 940)
Not mandatory, but sounds like we may want to have all 940 hardcoded in this function into some "const unsigned int min_arfcn = 940 ;)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/41361?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I0a9a2f64d9db65967699453c26ae282c4ddf4558
Gerrit-Change-Number: 41361
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 06 Nov 2025 15:13:22 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/41366?usp=email )
Change subject: OBS: lib/srcpkg: format with ruff
......................................................................
OBS: lib/srcpkg: format with ruff
Change-Id: I2cfb8fc5bd78449e62526758ddb9263cf3d8ced1
---
M .ruff.toml
M scripts/obs/lib/srcpkg.py
2 files changed, 59 insertions(+), 38 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/.ruff.toml b/.ruff.toml
index a75a783..c0b9b9d 100644
--- a/.ruff.toml
+++ b/.ruff.toml
@@ -16,7 +16,6 @@
"scripts/obs/lib/metapkg.py",
"scripts/obs/lib/osc.py",
"scripts/obs/lib/rpm_spec.py",
- "scripts/obs/lib/srcpkg.py",
"scripts/obs/update_obs_project.py",
"scripts/osmo-depcheck/buildstack.py",
"scripts/osmo-depcheck/config.py",
diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py
index 7b93937..78e49d1 100644
--- a/scripts/obs/lib/srcpkg.py
+++ b/scripts/obs/lib/srcpkg.py
@@ -10,7 +10,7 @@
def checkout_for_feed(project):
- """ checkout a commit, either latest tag or master or 20YY branch """
+ """checkout a commit, either latest tag or master or 20YY branch"""
feed = lib.args.feed
branch = lib.args.git_branch
if branch:
@@ -24,7 +24,7 @@
def get_git_version(project):
- """ :returns: the string from git-version-gen, e.g. '1.7.0.10-76bdb' """
+ """:returns: the string from git-version-gen, e.g. '1.7.0.10-76bdb'"""
repo_path = lib.git.get_repo_path(project)
# Run git-version-gen if it is in the repository
@@ -41,18 +41,29 @@
pattern = lib.git.get_latest_tag_pattern(project)
pattern = pattern.replace("^", "", 1)
pattern = pattern.replace("$", "", -1)
- result = lib.run_cmd(["git", "describe",
- "--abbrev=4",
- "--tags",
- f"--match={pattern}",
- "HEAD"], cwd=repo_path, check=False)
+ result = lib.run_cmd(
+ [
+ "git",
+ "describe",
+ "--abbrev=4",
+ "--tags",
+ f"--match={pattern}",
+ "HEAD",
+ ],
+ cwd=repo_path,
+ check=False,
+ )
if result.returncode == 128:
print(f"{project}: has no git tags")
- commit = lib.run_cmd(["git", "rev-parse", "HEAD"],
- cwd=repo_path).output[0:4]
- count = lib.run_cmd(["git", "rev-list", "--count", "HEAD"],
- cwd=repo_path).output.rstrip()
+ commit = lib.run_cmd(
+ ["git", "rev-parse", "HEAD"],
+ cwd=repo_path,
+ ).output[0:4]
+ count = lib.run_cmd(
+ ["git", "rev-list", "--count", "HEAD"],
+ cwd=repo_path,
+ ).output.rstrip()
try:
print(f"{project}: getting version from debian/changelog")
version = lib.debian.get_last_version_from_changelog(project)
@@ -105,14 +116,14 @@
def get_epoch(project):
- """ The osmo-gbproxy used to have the same package version as osmo-sgsn
- until 2021 where it was split into its own git repository. From then
- on, osmo-gbproxy has a 0.*.* package version, which is smaller than
- the previous 1.*.* from osmo-sgsn. We had to set the epoch to 1 for
- osmo-gbproxy so package managers know these 0.*.* versions are higher
- than the previous 1.*.* ones that are still found in e.g. debian 11.
- The epoch is set in debian/changelog, retrieve it from there.
- :returns: the epoch number if set, e.g. "1" or an empty string """
+ """The osmo-gbproxy used to have the same package version as osmo-sgsn
+ until 2021 where it was split into its own git repository. From then on,
+ osmo-gbproxy has a 0.*.* package version, which is smaller than the
+ previous 1.*.* from osmo-sgsn. We had to set the epoch to 1 for
+ osmo-gbproxy so package managers know these 0.*.* versions are higher than
+ the previous 1.*.* ones that are still found in e.g. debian 11. The epoch
+ is set in debian/changelog, retrieve it from there.
+ :returns: the epoch number if set, e.g. "1" or an empty string"""
version_epoch = lib.debian.get_last_version_from_changelog(project)
if ":" in version_epoch:
@@ -122,15 +133,17 @@
def prepare_project_open5gs():
- """ Download the subproject sources here, so the package can be built in
- OBS without Internet access. """
- lib.run_cmd(["meson", "subprojects", "download"],
- cwd=lib.git.get_repo_path("open5gs"))
+ """Download the subproject sources here, so the package can be built in
+ OBS without Internet access."""
+ lib.run_cmd(
+ ["meson", "subprojects", "download"],
+ cwd=lib.git.get_repo_path("open5gs"),
+ )
def run_generate_build_dep(project):
- """ Run contrib/generate_build_dep.sh if it exists in the given project, to
- to download sources for dependencies (see e.g. osmo_dia2gsup.git). """
+ """Run contrib/generate_build_dep.sh if it exists in the given project, to
+ to download sources for dependencies (see e.g. osmo_dia2gsup.git)."""
repo_path = lib.git.get_repo_path(project)
script_path = "contrib/generate_build_dep.sh"
@@ -147,10 +160,10 @@
def write_commit_txt(project):
- """ Write the current git commit to commit_$commit.txt file, so it gets
- uploaded to OBS along with the rest of the source package. This allows
- figuring out if the source package is still up-to-date or not for the
- master feed. """
+ """Write the current git commit to commit_$commit.txt file, so it gets
+ uploaded to OBS along with the rest of the source package. This allows
+ figuring out if the source package is still up-to-date or not for the
+ master feed."""
output_path = lib.get_output_path(project)
commit = lib.git.get_head(project)
@@ -160,16 +173,26 @@
def set_asciidoc_style_without_draft_watermark(project):
repo_path = lib.git.get_repo_path(project)
- doc_makefiles = lib.run_cmd(["grep", "-r", "-l", "include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc"], cwd=repo_path, check=False)
+ doc_makefiles = lib.run_cmd(
+ ["grep", "-r", "-l", "include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc"],
+ cwd=repo_path,
+ check=False,
+ )
doc_makefiles = doc_makefiles.output.rstrip().split("\n")
for doc_makefile in doc_makefiles:
if doc_makefile == "":
continue
print(f"{project}: setting asciidoc style to remove draft watermark in {doc_makefile}")
- lib.run_cmd(["sed", "-i",
- '/\\/build\\/Makefile\\.asciidoc\\.inc/s/^/ ASCIIDOCSTYLE = $(BUILDDIR)\\/custom-dblatex.sty\\n/',
- doc_makefile], cwd=repo_path)
+ lib.run_cmd(
+ [
+ "sed",
+ "-i",
+ "/\\/build\\/Makefile\\.asciidoc\\.inc/s/^/ ASCIIDOCSTYLE = $(BUILDDIR)\\/custom-dblatex.sty\\n/",
+ doc_makefile,
+ ],
+ cwd=repo_path,
+ )
def build(project, gerrit_id=0):
@@ -237,15 +260,14 @@
def requires_osmo_gsm_manuals_dev(project):
- """ Check if an already built source package has osmo-gsm-manuals-dev in
- Build-Depends of the .dsc file """
+ """Check if an already built source package has osmo-gsm-manuals-dev in
+ Build-Depends of the .dsc file"""
path_dsc = glob.glob(f"{lib.get_output_path(project)}/*.dsc")
assert len(path_dsc) == 1, f"failed to get dsc path for {project}"
with open(path_dsc[0], "r") as handle:
for line in handle.readlines():
- if line.startswith("Build-Depends:") \
- and "osmo-gsm-manuals-dev" in line:
+ if line.startswith("Build-Depends:") and "osmo-gsm-manuals-dev" in line:
return True
return False
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41366?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: I2cfb8fc5bd78449e62526758ddb9263cf3d8ced1
Gerrit-Change-Number: 41366
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>
Attention is currently required from: jolly.
fixeria has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41360?usp=email )
Change subject: Indicate ER-GSM band support in MS classmark 3
......................................................................
Patch Set 4:
(2 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmocom-bb/+/41360/comment/d6c10e9d_7ee22e4d?u… :
PS4, Line 7: Indicate ER-GSM band support in MS classmark 3
> modile app: Indicate...
Acknowledged
File src/host/layer23/src/mobile/gsm48_rr.c:
https://gerrit.osmocom.org/c/osmocom-bb/+/41360/comment/974d352d_ac7d6724?u… :
PS4, Line 1442: // FIXME: Add setting for the following features
> what about this?
These bits are not relevant in the context of ER-GSM, they just need to be in the bitmask. So this is more a TODO than FIXME; one can always add the respective VTY options, if/when needed.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41360?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ica13814eddb5293c7d7a2a21dd6a7a437cd1d351
Gerrit-Change-Number: 41360
Gerrit-PatchSet: 4
Gerrit-Owner: jolly <andreas(a)eversberg.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: jolly <andreas(a)eversberg.eu>
Gerrit-Comment-Date: Thu, 06 Nov 2025 15:11:58 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Attention is currently required from: jolly.
pespin has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41358?usp=email )
Change subject: RSSI app: Use correct BSIC for RACH bursts
......................................................................
Patch Set 1:
(2 comments)
Patchset:
PS1:
Agree with fixeria that "Fixes" really helps understand this commit, please add it.
File src/target/firmware/apps/rssi/main.c:
https://gerrit.osmocom.org/c/osmocom-bb/+/41358/comment/44941be1_8d70e9b9?u… :
PS1, Line 1212: rach_req->uic = 0xff;
Probably makes sense to add a comment: /* Invalid UIC, so that BSIC is used */
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41358?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I63ed20160d9d45cbc3f70cec8b1c0af262fdde19
Gerrit-Change-Number: 41358
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Comment-Date: Thu, 06 Nov 2025 15:10:09 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Attention is currently required from: jolly, laforge.
fixeria has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41359?usp=email )
Change subject: Add ER-GSM band support to all relevant applications
......................................................................
Patch Set 3:
(2 comments)
File src/host/layer23/src/common/support.c:
https://gerrit.osmocom.org/c/osmocom-bb/+/41359/comment/04509981_97b43833?u… :
PS3, Line 134: :
cosmetic: align with other entries
File src/shared/libosmocore/src/gsm/gsm_utils.c:
https://gerrit.osmocom.org/c/osmocom-bb/+/41359/comment/628be374_a4871c53?u… :
PS3, Line 484: else if (arfcn >= 940 && arfcn <= 1023)
> It probably makes sense to split this libosmocore changes to a separate patch, and reference the lib […]
Acknowledged
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41359?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I71baa3317df685cf6479b6e20e6ae078911aa24f
Gerrit-Change-Number: 41359
Gerrit-PatchSet: 3
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Thu, 06 Nov 2025 15:08:25 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Attention is currently required from: fixeria, jolly.
pespin has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41360?usp=email )
Change subject: Indicate ER-GSM band support in MS classmark 3
......................................................................
Patch Set 4: Code-Review+1
(2 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmocom-bb/+/41360/comment/9576e341_196dd4e5?u… :
PS4, Line 7: Indicate ER-GSM band support in MS classmark 3
modile app: Indicate...
File src/host/layer23/src/mobile/gsm48_rr.c:
https://gerrit.osmocom.org/c/osmocom-bb/+/41360/comment/106df9e0_b79b0977?u… :
PS4, Line 1442: // FIXME: Add setting for the following features
what about this?
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41360?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ica13814eddb5293c7d7a2a21dd6a7a437cd1d351
Gerrit-Change-Number: 41360
Gerrit-PatchSet: 4
Gerrit-Owner: jolly <andreas(a)eversberg.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: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 06 Nov 2025 15:05:23 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Attention is currently required from: fixeria, jolly, laforge.
pespin has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41359?usp=email )
Change subject: Add ER-GSM band support to all relevant applications
......................................................................
Patch Set 3:
(2 comments)
File src/host/layer23/src/common/sysinfo.c:
https://gerrit.osmocom.org/c/osmocom-bb/+/41359/comment/439864c5_763730bf?u… :
PS3, Line 406: return gsm48_decode_freq_list(f, cd, len, mask, frqt);
sounds like libosmocore will require support for eg_gsm in this API?
File src/shared/libosmocore/src/gsm/gsm_utils.c:
https://gerrit.osmocom.org/c/osmocom-bb/+/41359/comment/8cd52140_89667183?u… :
PS3, Line 484: else if (arfcn >= 940 && arfcn <= 1023)
It probably makes sense to split this libosmocore changes to a separate patch, and reference the libosmocore.git one it was backported from.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41359?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I71baa3317df685cf6479b6e20e6ae078911aa24f
Gerrit-Change-Number: 41359
Gerrit-PatchSet: 3
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 06 Nov 2025 15:03:26 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No