Module: Mesa Branch: main Commit: 1e13c7ca4653d7ffd1dcad54ad52af96e1021b59 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1e13c7ca4653d7ffd1dcad54ad52af96e1021b59
Author: David Heidelberg <david.heidelb...@collabora.com> Date: Sun Oct 22 18:28:05 2023 +0200 ci/wine: move wine configuration into rootfs where is wine available As we removed wine from builds, we need to use the one installed in rootfs. Signed-off-by: David Heidelberg <david.heidelb...@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25843> --- .gitlab-ci/container/lava_build.sh | 19 ++++++++++++------- .gitlab-ci/container/setup-rootfs.sh | 6 ++++++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index 8c53b250982..7aba8827bb7 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -221,13 +221,6 @@ mmdebstrap \ ############### Install mold . .gitlab-ci/container/build-mold.sh -############### Setuping -if [ "$DEBIAN_ARCH" = "amd64" ]; then - . .gitlab-ci/container/setup-wine.sh "/dxvk-wine64" - . .gitlab-ci/container/install-wine-dxvk.sh - mv /dxvk-wine64 $ROOTFS -fi - ############### Installing if [ "$DEBIAN_ARCH" = "amd64" ]; then . .gitlab-ci/container/install-wine-apitrace.sh @@ -322,12 +315,24 @@ rm -rf /root/.rustup ############### Fill rootfs cp .gitlab-ci/container/setup-rootfs.sh $ROOTFS/. +cp .gitlab-ci/container/setup-wine.sh $ROOTFS/. +cp .gitlab-ci/container/install-wine-dxvk.sh $ROOTFS/. cp .gitlab-ci/container/strip-rootfs.sh $ROOTFS/. cp .gitlab-ci/container/debian/llvm-snapshot.gpg.key $ROOTFS/. cp .gitlab-ci/container/debian/winehq.gpg.key $ROOTFS/. + +mount -t proc none "$ROOTFS/proc" +mount --rbind /sys "$ROOTFS/sys" && mount --make-rslave "$ROOTFS/sys" +mount --rbind /dev "$ROOTFS/dev" && mount --make-rslave "$ROOTFS/dev" chroot $ROOTFS bash /setup-rootfs.sh +umount -R "$ROOTFS/dev" +umount -R "$ROOTFS/sys" +umount "$ROOTFS/proc" + rm $ROOTFS/{llvm-snapshot,winehq}.gpg.key rm "$ROOTFS/setup-rootfs.sh" +rm "$ROOTFS/setup-wine.sh" +rm "$ROOTFS/install-wine-dxvk.sh" rm "$ROOTFS/strip-rootfs.sh" cp /etc/wgetrc $ROOTFS/etc/. diff --git a/.gitlab-ci/container/setup-rootfs.sh b/.gitlab-ci/container/setup-rootfs.sh index 596f50c467b..0b4d169d35d 100644 --- a/.gitlab-ci/container/setup-rootfs.sh +++ b/.gitlab-ci/container/setup-rootfs.sh @@ -27,5 +27,11 @@ chmod +x /init # Copy timezone file and remove tzdata package rm -rf /etc/localtime cp /usr/share/zoneinfo/Etc/UTC /etc/localtime +echo "nameserver 8.8.8.8" > /etc/resolv.conf + +if [ "$DEBIAN_ARCH" = "amd64" ]; then + . setup-wine.sh "/dxvk-wine64" + . install-wine-dxvk.sh +fi . strip-rootfs.sh
