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.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25843>
This commit is contained in:
David Heidelberg
2023-10-22 18:28:05 +02:00
committed by Marge Bot
parent 35c7b5e159
commit 1e13c7ca46
2 changed files with 18 additions and 7 deletions

View File

@@ -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/.

View File

@@ -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