June 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ci[master]: OBS: get_git_version: debian/changelog as fallback

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37179?usp=email ) Change subject: OBS: get_git_version: debian/changelog as fallback ...................................................................... OBS: get_git_version: debian/changelog as fallback Fix osmocom-bb getting 0.1.0 as version: osmocom-bb: has no git tags, using 0.0.0 as version osmocom-bb: building source package 0.0.0.3621-d70e osmocom-bb: WARNING: version from changelog (0.1.0) is higher than version based on git tag (0.0.0.3621-d70e), using version from changelog (git tag not pushed yet?) With this patch: osmocom-bb: has no git tags osmocom-bb: getting version from debian/changelog osmocom-bb: building source package 0.1.0.3621-d70e osmocom-bb: adding debian/changelog entry (0.1.0 => 0.1.0.3621-d70e) Change-Id: I3a284b50ca62a2faff16702b7108ca391229caf1 --- M scripts/obs/lib/srcpkg.py 1 file changed, 30 insertions(+), 2 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/srcpkg.py b/scripts/obs/lib/srcpkg.py index 4da6b70..e24f25e 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -49,12 +49,18 @@ "HEAD"], cwd=repo_path, check=False) if result.returncode == 128: - print(f"{project}: has no git tags, using 0.0.0 as version") + 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() - return f"0.0.0.{count}-{commit}" + try: + print(f"{project}: getting version from debian/changelog") + version = lib.debian.get_last_version_from_changelog(project) + return f"{version}.{count}-{commit}" + except: + print(f"{project}: using 0.0.0 as version") + return f"0.0.0.{count}-{commit}" if result.returncode != 0: lib.exit_error_cmd(result, "command failed unexpectedly") -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37179?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: I3a284b50ca62a2faff16702b7108ca391229caf1 Gerrit-Change-Number: 37179 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 year

1
0
0 0

[M] Change in osmo-ci[master]: OBS: improve argparse help output

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37171?usp=email ) Change subject: OBS: improve argparse help output ...................................................................... OBS: improve argparse help output Prepare to add more arguments, by first categorizing the existing arguments into groups. Tweak the descriptions while at it. Change-Id: I09a8caa885b72b9d806fbfb4c8d72fe9667feec5 --- M scripts/obs/build_srcpkg.py M scripts/obs/lib/__init__.py M scripts/obs/update_obs_project.py 3 files changed, 93 insertions(+), 64 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved daniel: Looks good to me, but someone else must approve diff --git a/scripts/obs/build_srcpkg.py b/scripts/obs/build_srcpkg.py index a5feeea..86655f5 100755 --- a/scripts/obs/build_srcpkg.py +++ b/scripts/obs/build_srcpkg.py @@ -18,9 +18,9 @@ " code that runs to generate source packages which we" " upload to https://obs.osmocom.org." f" Output dir: {lib.config.path_temp}/srcpkgs") - lib.add_shared_arguments(parser) - parser.add_argument("-g", "--gerrit-id", type=int, default=0, - help="clone particular revision from gerrit using given ID") + groups = lib.add_shared_arguments(parser) + groups["git"].add_argument("-g", "--gerrit-id", type=int, default=0, + help="clone particular revision from gerrit using given ID") parser.add_argument("package", nargs="?", help="package name, e.g. libosmocore or open5gs") args = parser.parse_args() diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index a85f777..2cb8a40 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -19,60 +19,74 @@ def add_shared_arguments(parser): """ Arguments shared between build_srcpkg.py and update_obs_project.py. """ - parser.add_argument("-f", "--feed", - help="package feed (default: nightly). The feed" - " determines the git revision to be built:" - " 'nightly' and 'master' build 'origin/master'," - " 'latest' builds the last signed tag," - " other feeds build their respective branch.", - metavar="FEED", default="nightly", - choices=lib.config.feeds) - parser.add_argument("-a", "--allow-unknown-package", action="store_true", - help="don't complain if the name of the package is not" - " stored in lib/config.py") - parser.add_argument("-b", "--git-branch", help="instead of using a branch" - " based on the feed, checkout this git branch", - metavar="BRANCH", default=None) - parser.add_argument("-d", "--docker", - help="run in docker to avoid installing required pkgs", - action="store_true") - parser.add_argument("-s", "--git-skip-fetch", - help="do not fetch already cloned git repositories", - action="store_false", dest="git_fetch") - parser.add_argument("-S", "--git-skip-checkout", - help="do not checkout and reset to a branch/tag", - action="store_false", dest="git_checkout") - parser.add_argument("-m", "--meta", action="store_true", - help="build a meta package (e.g. osmocom-nightly)") - parser.add_argument("-i", "--ignore-req", action="store_true", - help="skip required programs check") - parser.add_argument("-c", "--conflict-version", nargs="?", - help="Of the generated source packages, all Osmocom" - " packages (not e.g. open5gs, see lib/config.py" - " for full list) depend on a meta-package such as" - " osmocom-nightly, osmocom-latest, osmocom-2021q1" - " etc. These meta-packages conflict with each" - " other to ensure that one does not mix e.g." - " latest and nightly packages by accident." - " With this -c argument, it is possible to let" - " these packages depend on a meta-package of a" - " specific version. This is used for nightly and" - " 20YYqX packages to ensure they are not mixed" - " from different build dates (ABI compatibility" - " is only on latest).") - parser.add_argument("-p", "--conflict-pkgname", nargs="?", - help="name of the meta-package to depend on (default:" - " osmocom-$feed)") - parser.add_argument("-M", "--no-meta", action="store_true", - help="Don't depend on the meta package (helpful when" - " building one-off packages for development)") - parser.add_argument("-v", "--verbose", action="store_true", + + group_reqprog = parser.add_argument_group("required program options") + group_reqprog.add_argument("-d", "--docker", help="run in docker to avoid" + " installing required pkgs", + action="store_true") + group_reqprog.add_argument("-i", "--ignore-req", action="store_true", + help="skip required programs check") + + group_feed = parser.add_argument_group("feed options", + "The feed option implies the source revision (nightly/master: build" + " the master branch; latest: build the last tag) and when a package" + " is considered outdated (latest/master: when the commit changes on" + " the latest tag or on master; nightly: always).") + group_feed.add_argument("-f", "--feed", help="package feed (default:" + " nightly, can also be master or latest)", + metavar="FEED", default="nightly", + choices=lib.config.feeds) + + group_pkg = parser.add_argument_group("package options") + group_pkg.add_argument("-a", "--allow-unknown-package", + action="store_true", + help="don't complain if the name of the package is" + " not stored in lib/config.py") + group_pkg.add_argument("-e", "--version-append", + help="add a string at the end of the version, e.g." + " '~osmocom' for the wireshark package") + + group_git = parser.add_argument_group("git options") + group_git.add_argument("-b", "--git-branch", help="instead of using a" + " branch based on the feed, checkout this git" + " branch", metavar="BRANCH", default=None) + group_git.add_argument("-s", "--git-skip-fetch", + help="do not fetch already cloned git repositories", + action="store_false", dest="git_fetch") + group_git.add_argument("-S", "--git-skip-checkout", + help="do not checkout and reset to a branch/tag", + action="store_false", dest="git_checkout") + + group_meta = parser.add_argument_group("meta package options", + "Osmocom packages depend on a meta-package such as osmocom-nightly." + " These meta-packages conflict with each other to ensure e.g." + " incompatible nightly and latest packages are not mixed by accident." + " For nightly we don't have API compatibility and so we let these" + " depend on a meta package of a specific build date (-c).") + group_meta.add_argument("-m", "--meta", action="store_true", + help="build a meta package (e.g. osmocom-nightly)") + group_meta.add_argument("-c", "--conflict-version", nargs="?", + help="depend on meta-package of specific version") + group_meta.add_argument("-p", "--conflict-pkgname", nargs="?", + help="name of the meta-package to depend on" + " (default: osmocom-$feed)") + group_meta.add_argument("-M", "--no-meta", action="store_true", + help="Don't depend on the meta package (use when" + " building one-off packages for development)") + + group_devel = parser.add_argument_group("development options") + group_devel.add_argument("-v", "--verbose", action="store_true", help="always print shell commands and their output," " instead of only printing them on error") - parser.add_argument("-e", "--version-append", - help="add a string at the end of the version, e.g." - " '~osmocom' for the wireshark package to" - " indicate that it is the version from our repo") + + return { + "devel": group_devel, + "feed": group_feed, + "git": group_git, + "meta": group_meta, + "pkg": group_pkg, + "reqprog": group_reqprog, + } def set_cmds_verbose(new_val): diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index a456218..ea9b731 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -210,15 +210,18 @@ parser = argparse.ArgumentParser( description="Generate source packages and upload them to OBS.") lib.add_shared_arguments(parser) - parser.add_argument("-A", "--apiurl", help="OBS API URL or .oscrc alias" - " (e.g. https://obs.osmocom.org)") - parser.add_argument("-n", "--no-skip-up-to-date", - dest="skip_up_to_date", action="store_false", - help="for latest feed, build and upload packages even" - " if the version did not change") - parser.add_argument("--delete", action="store_true", - help="remove packages from OBS if the git branch (-b)" - " does not exist anymore") + + group_obs = parser.add_argument_group("OBS options") + group_obs.add_argument("-A", "--apiurl", help="OBS API URL or .oscrc alias" + " (e.g. https://obs.osmocom.org)") + group_obs.add_argument("-n", "--no-skip-up-to-date", + dest="skip_up_to_date", action="store_false", + help="for latest feed, build and upload packages" + " even if the version did not change") + group_obs.add_argument("--delete", action="store_true", + help="remove packages from OBS if the git branch" + " (-b) does not exist anymore") + parser.add_argument("obs_project", help="OBS project, e.g. home:osmith:nightly") parser.add_argument("package", nargs="*", -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37171?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: I09a8caa885b72b9d806fbfb4c8d72fe9667feec5 Gerrit-Change-Number: 37171 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 year

1
0
0 0

[S] Change in osmo-ci[master]: OBS: update_obs_project: add --exclude-package

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37172?usp=email ) Change subject: OBS: update_obs_project: add --exclude-package ...................................................................... OBS: update_obs_project: add --exclude-package Prepare for building the asan repository. We don't need to build e.g. the erlang projects for that. Related: OS#5301 Change-Id: If02fd38da05113e28ee401d592edfc7528388308 --- M scripts/obs/update_obs_project.py 1 file changed, 28 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index ea9b731..6f3bffc 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -21,7 +21,7 @@ srcpkgs_updated = [] # list of pkgnames -def parse_packages(packages_arg): +def parse_packages(packages_arg, excludes_arg): ret = [] if packages_arg: for package in packages_arg: @@ -29,11 +29,15 @@ ret += lib.config.projects_osmocom else: ret += [lib.set_proper_package_name(package)] - return ret + else: # Default to all + ret += lib.config.projects_osmocom + ret += lib.config.projects_other - # Default to all - ret += lib.config.projects_osmocom - ret += lib.config.projects_other + # Apply --exclude-package + for package in excludes_arg: + if package in ret: + ret.remove(package) + return ret @@ -209,7 +213,11 @@ def main(): parser = argparse.ArgumentParser( description="Generate source packages and upload them to OBS.") - lib.add_shared_arguments(parser) + groups = lib.add_shared_arguments(parser) + + groups["pkg"].add_argument("-E", "--exclude-package", nargs="*", + default=[], + help="do not build and update this package") group_obs = parser.add_argument_group("OBS options") group_obs.add_argument("-A", "--apiurl", help="OBS API URL or .oscrc alias" @@ -230,7 +238,7 @@ args = parser.parse_args() validate_args(args) lib.set_args(args) - packages = parse_packages(args.package) + packages = parse_packages(args.package, args.exclude_package) if args.docker: lib.docker.run_in_docker_and_exit("update_obs_project.py", True) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37172?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: If02fd38da05113e28ee401d592edfc7528388308 Gerrit-Change-Number: 37172 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 year

1
0
0 0

[S] Change in osmo-ci[master]: OBS: fix python 3.12 compat

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37170?usp=email ) Change subject: OBS: fix python 3.12 compat ...................................................................... OBS: fix python 3.12 compat Fix for: File "/home/user/code/osmo-dev/src/osmo-ci/scripts/obs/lib/__init__.py", line 112, in check_required_programs if not importlib.find_loader(module): ^^^^^^^^^^^^^^^^^^^^^ AttributeError: module 'importlib' has no attribute 'find_loader Change-Id: I6430c2c4f75c8408d00305e1a1f0a64600eb086c --- M scripts/obs/lib/__init__.py 1 file changed, 18 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index 5292dc5..a85f777 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2022 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> -import importlib +import importlib.util import os import shutil import subprocess @@ -95,7 +95,7 @@ ok = False for module in lib.config.required_python_modules: - if not importlib.find_loader(module): + if not importlib.util.find_spec(module): print(f"ERROR: missing python3 module: {module}") ok = False -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37170?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: I6430c2c4f75c8408d00305e1a1f0a64600eb086c Gerrit-Change-Number: 37170 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[M] Change in osmo-ci[master]: OBS: add --configure-append

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37173?usp=email ) Change subject: OBS: add --configure-append ...................................................................... OBS: add --configure-append Add a parameter for appending arguments to the ./configure line as it gets called in the debian package. This will be used for asan packages. Related: OS#5301 Change-Id: I5ae396cc190559eb9c6a1671db374a91f03924e7 --- M scripts/obs/lib/__init__.py M scripts/obs/lib/debian.py M scripts/obs/lib/srcpkg.py 3 files changed, 52 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index 2cb8a40..2e59806 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -45,6 +45,9 @@ group_pkg.add_argument("-e", "--version-append", help="add a string at the end of the version, e.g." " '~osmocom' for the wireshark package") + group_pkg.add_argument("-C", "--configure-append", + help="add these parameters to the ./configure line" + " (e.g. ' --enable-sanitize')") 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 6703f8b..dd85729 100644 --- a/scripts/obs/lib/debian.py +++ b/scripts/obs/lib/debian.py @@ -120,6 +120,39 @@ changelog_add_entry(project, version) +def configure_append(project, parameters): + """ Add one or more configure parameters like --enable-sanitize to the + dh_auto_configure line, also add the override_dh_auto_configure block + if missing. """ + print(f"{project}: adding configure parameters: {parameters}") + rules = f"{lib.git.get_repo_path(project)}/debian/rules" + override_found = False + replaced = False + with open(rules, "r") as f: + lines = f.readlines() + for i in range(len(lines)): + line = lines[i] + if line.startswith("override_dh_auto_configure:"): + override_found = True + continue + if "dh_auto_configure" not in line: + continue + assert override_found + if " -- " in line.replace("\t", " "): + lines[i] = line.replace(" --", f" -- {parameters}", 1) + else: + lines[i] = line.replace("dh_auto_configure", + f"dh_auto_configure -- {parameters}", 1) + replaced = True + break + if not override_found: + lines += ["\n", + "override_dh_auto_configure:\n", + f"\tdh_auto_configure -- {parameters}\n"] + with open(rules, "w") as f: + f.writelines(lines) + + 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 aef7732..7701a83 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -204,6 +204,9 @@ if project in lib.config.projects_osmocom: run_generate_build_dep(project) + if lib.args.configure_append: + lib.debian.configure_append(project, lib.args.configure_append) + lib.debian.build_source_package(project) lib.debian.move_files_to_output(project) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37173?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: I5ae396cc190559eb9c6a1671db374a91f03924e7 Gerrit-Change-Number: 37173 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 year

1
0
0 0

[S] Change in osmo-ci[master]: OBS: add --disable-manuals

by osmith

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 year

1
0
0 0

[M] Change in osmo-ci[master]: OBS: fix using --conflict-pkgname

by osmith

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 year

1
0
0 0

[S] Change in simtrace2[master]: ngff_cardem: cosmetic: fix superflous space

by lynxis lazus

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 year

1
0
0 0

[S] Change in simtrace2[master]: RFC: card emu config: add feature sim polarity

by lynxis lazus

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 year

1
0
0 0

[S] Change in simtrace2[master]: dissector: add support for sim polarity

by lynxis lazus

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 year

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2024