osmith submitted this change.

View Change

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
---
M scripts/obs/lib/srcpkg.py
1 file 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_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"))
 
 

To view, visit change 30263. To unsubscribe, or for help writing mail filters, visit settings.