NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "ci/wine: move wine configuration into rootfs where is wine available"

Browse source 
This reverts commit 63b42e4007fec8746f7a3848b3816d36124dcbfd.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25843>
This commit is contained in:
David Heidelberg 2023-10-28 10:55:09 +02:00 • committed by Marge Bot
parent 1e13c7ca46
commit 81aaeb80f7
2 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

19
.gitlab-ci/container/lava_build.sh
View file

@ -221,6 +221,13 @@ mmdebstrap \
############### Install mold ############### Install mold
. .gitlab-ci/container/build-mold.sh . .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 ############### Installing
if [ "$DEBIAN_ARCH" = "amd64" ]; then if [ "$DEBIAN_ARCH" = "amd64" ]; then
. .gitlab-ci/container/install-wine-apitrace.sh . .gitlab-ci/container/install-wine-apitrace.sh
@ -315,24 +322,12 @@ rm -rf /root/.rustup
############### Fill rootfs ############### Fill rootfs
cp .gitlab-ci/container/setup-rootfs.sh $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/strip-rootfs.sh $ROOTFS/.
cp .gitlab-ci/container/debian/llvm-snapshot.gpg.key $ROOTFS/. cp .gitlab-ci/container/debian/llvm-snapshot.gpg.key $ROOTFS/.
cp .gitlab-ci/container/debian/winehq.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 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/{llvm-snapshot,winehq}.gpg.key
rm "$ROOTFS/setup-rootfs.sh" rm "$ROOTFS/setup-rootfs.sh"
rm "$ROOTFS/setup-wine.sh"
rm "$ROOTFS/install-wine-dxvk.sh"
rm "$ROOTFS/strip-rootfs.sh" rm "$ROOTFS/strip-rootfs.sh"
cp /etc/wgetrc $ROOTFS/etc/. cp /etc/wgetrc $ROOTFS/etc/.

6
.gitlab-ci/container/setup-rootfs.sh
View file

@ -27,11 +27,5 @@ chmod +x /init
# Copy timezone file and remove tzdata package # Copy timezone file and remove tzdata package
rm -rf /etc/localtime rm -rf /etc/localtime
cp /usr/share/zoneinfo/Etc/UTC /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 . strip-rootfs.sh