aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2022-11-21 16:48:35 +0100
committerOliver Smith <osmith@sysmocom.de>2022-11-21 16:48:35 +0100
commit1263d6e0b9484b5ddee9d669f3c9b64c8d5f8c17 (patch)
treee4a8a163c044be9c52d0772ee45abb1f50d6326f
parentb3fa89154bba28e55d02fb284bf6a84ee58a7f1e (diff)
obs/srcpkg: open5gs: download all subprojects
With recent changes in open5gs, building the source packages we generated fails: [ 45s] ../lib/metrics/meson.build:52:4: ERROR: Automatic wrap-based subproject downloading is disabled [ 45s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 Fix this by downloading all subprojects. This is now possible as I added a meson.build file to the prometheus-client-c repository that open5gs uses: https://github.com/open5gs/prometheus-client-c/pull/2 Change-Id: If3910b520382b177a77b216c93771ea88414723d
-rw-r--r--scripts/obs/lib/srcpkg.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py
index b37b8b3..e888ffa 100644
--- a/scripts/obs/lib/srcpkg.py
+++ b/scripts/obs/lib/srcpkg.py
@@ -105,10 +105,9 @@ def prepare_project_osmo_dia2gsup():
def prepare_project_open5gs():
- """ Build fails without downloading freeDiameter sources. Also we can't
- just update all subprojects because it would fail with 'Subproject
- exists but has no meson.build file' for promethous-client-c. """
- lib.run_cmd(["meson", "subprojects", "download", "freeDiameter"],
+ """ 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"))