From 886481beb162fa1d665d65aebdce083ce9cda084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 9 Oct 2024 00:44:23 +0200 Subject: [PATCH] tools/toolbox: Install sysext dependencies if necessary While the toolbox image itself has all necessary dependencies to build and run the shell, we still need them in the destdir when building a system extension. Achieve this by running .gitlab-ci/install-common-dependencies.sh if it exists, which is the script that is used both for gnome-os system extensions and mutter's CI image. Part-of: --- tools/toolbox/meson-build.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/toolbox/meson-build.sh b/tools/toolbox/meson-build.sh index a2f637c7c..3b6a793af 100755 --- a/tools/toolbox/meson-build.sh +++ b/tools/toolbox/meson-build.sh @@ -52,6 +52,12 @@ compile_command() { install_command() { local destdir=${BUILD_SYSEXT:+/var/lib/extensions/$TOOLBOX} + + local install_deps=.gitlab-ci/install-common-dependencies.sh + if [[ $BUILD_SYSEXT && -x $install_deps ]]; then + echo -n "$install_deps --destdir $destdir && " + fi + if [[ $destdir || ! $RUN_DIST ]]; then echo -n "sudo meson install -C $BUILD_DIR ${destdir:+--destdir=$destdir}" else