daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/35126?usp=email ) Change subject: scripts/obs: Add -M/--no-meta option to avoid depending on osmocom-* ...................................................................... scripts/obs: Add -M/--no-meta option to avoid depending on osmocom-* This is useful for testing one-off dev packages Change-Id: Id18c75de559c9ba29efd38d8510f2db3206c4209 --- M scripts/obs/lib/__init__.py M scripts/obs/lib/srcpkg.py 2 files changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/26/35126/1 diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index 226015a..5292dc5 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -63,6 +63,9 @@ 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", help="always print shell commands and their output," " instead of only printing them on error") diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index 05a705f..aef7732 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -185,7 +185,7 @@ print(f"{project}: building source package {version_epoch}") write_tarball_version(project, version_epoch) - if project in lib.config.projects_osmocom: + if project in lib.config.projects_osmocom and not lib.args.no_meta: metapkg = lib.args.conflict_pkgname or f"osmocom-{feed}" lib.debian.control_add_depend(project, metapkg, conflict_version) if has_rpm_spec: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35126?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: Id18c75de559c9ba29efd38d8510f2db3206c4209 Gerrit-Change-Number: 35126 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann@sysmocom.de> Gerrit-MessageType: newchange