osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40430?usp=email ) Change subject: OBS: let meta package depend on osmocom-keyring ...................................................................... OBS: let meta package depend on osmocom-keyring Let the meta package (osmocom-latest, osmocom-nightly etc.) depend on osmocom-keyring. This means that after the user has enabled any of the official Osmocom OBS repositories and installs a package from there, the osmocom-keyring package will get installed as well, which results in having an up-to-date /usr/share/osmocom-keyring/osmocom.asc. Change-Id: Id4d213f355338b39a9ec5ccffc16179f6e472102 --- M scripts/obs/lib/config.py M scripts/obs/lib/metapkg.py 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/30/40430/1 diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 1a22f23..7d6b9e0 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -170,4 +170,4 @@ check_new_distros_version_regex = re.compile(r'[0-9.]+$') # Version of the osmocom-latest / osmocom-nightly etc. meta package -meta_package_version = "1.0.0" +meta_package_version = "1.1.0" diff --git a/scripts/obs/lib/metapkg.py b/scripts/obs/lib/metapkg.py index b60e2f2..4b67db2 100644 --- a/scripts/obs/lib/metapkg.py +++ b/scripts/obs/lib/metapkg.py @@ -39,7 +39,7 @@ f.write("Standards-Version: 3.9.8\n") f.write("\n") f.write(f"Package: {pkgname}\n") - f.write("Depends: ${misc:Depends}\n") + f.write("Depends: osmocom-keyring ${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") -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40430?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id4d213f355338b39a9ec5ccffc16179f6e472102 Gerrit-Change-Number: 40430 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>