From fd4320156c930f9bbafea286280d6d9e739eca1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 29 Nov 2024 17:54:32 +0100 Subject: [PATCH] ci: Change `update-mutter` to also install to sysext dir Out development toolbox contains an `update-mutter` command to make it easier to keep mutter up-to-date for people who only want to deal with gnome-shell. To allow them to make use of the new sysext tooling, change the command to install both to the toolbox root and the sysext directory. Part-of: --- .gitlab-ci/build-toolbox-image.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/build-toolbox-image.sh b/.gitlab-ci/build-toolbox-image.sh index da9e1f852..9c0fb5e79 100755 --- a/.gitlab-ci/build-toolbox-image.sh +++ b/.gitlab-ci/build-toolbox-image.sh @@ -57,7 +57,10 @@ build_container() { local update_mutter=$(mktemp) cat > $update_mutter <<-EOF #!/bin/sh - /usr/libexec/install-meson-project.sh https://gitlab.gnome.org/GNOME/mutter.git $MUTTER_BRANCH + TOOLBOX=\$(. /run/.containerenv; echo \$name) + /usr/libexec/install-meson-project.sh \\ + --destdir=/ --destdir=/var/lib/extensions/\$TOOLBOX \\ + https://gitlab.gnome.org/GNOME/mutter.git $MUTTER_BRANCH EOF buildah copy --chmod 755 $build_cntr $update_mutter /usr/bin/update-mutter