Skip to content

Commit

Permalink
fix(deck): Move mesa fixes into single script
Browse files Browse the repository at this point in the history
Otherwise the /tmp directories get removed before everything is finished
  • Loading branch information
zelikos committed Dec 30, 2024
1 parent 38fcabf commit 3fb2115
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 61 deletions.
47 changes: 47 additions & 0 deletions files/scripts/mesa-fix.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
#!/usr/bin/env bash

# Tell this script to exit if there are any errors.
# You should have this in every custom script, to ensure that your completed
# builds actually ran successfully without any errors!
set -oue pipefail

mkdir -p /tmp/mesa-fix64/dri && \
cp /usr/lib64/libgallium-*.so /tmp/mesa-fix64/ && \
cp /usr/lib64/dri/kms_swrast_dri.so /tmp/mesa-fix64/dri/ && \
cp /usr/lib64/dri/libdril_dri.so /tmp/mesa-fix64/dri/ && \
cp /usr/lib64/dri/swrast_dri.so /tmp/mesa-fix64/dri/ && \
cp /usr/lib64/dri/virtio_gpu_dri.so /tmp/mesa-fix64/dri/ && \
mkdir -p /tmp/mesa-fix32/dri && \
cp /usr/lib/libgallium-*.so /tmp/mesa-fix32/ && \
cp /usr/lib/dri/kms_swrast_dri.so /tmp/mesa-fix32/dri/ && \
cp /usr/lib/dri/libdril_dri.so /tmp/mesa-fix32/dri/ && \
cp /usr/lib/dri/swrast_dri.so /tmp/mesa-fix32/dri/ && \
cp /usr/lib/dri/virtio_gpu_dri.so /tmp/mesa-fix32/dri/ && \
rpm-ostree override replace \
--experimental \
--from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite-multilib \
mesa-libxatracker \
mesa-libglapi \
mesa-dri-drivers \
mesa-libgbm \
mesa-libEGL \
mesa-vulkan-drivers \
mesa-libGL \
pipewire \
pipewire-alsa \
pipewire-gstreamer \
pipewire-jack-audio-connection-kit \
pipewire-jack-audio-connection-kit-libs \
pipewire-libs \
pipewire-pulseaudio \
pipewire-utils \
pipewire-plugin-libcamera \
bluez \
bluez-obexd \
bluez-cups \
bluez-libs \
xorg-x11-server-Xwayland && \
rsync -a /tmp/mesa-fix64/ /usr/lib64/ && \
rsync -a /tmp/mesa-fix32/ /usr/lib/ && \
rm -rf /tmp/mesa-fix64 && \
rm -rf /tmp/mesa-fix32
19 changes: 0 additions & 19 deletions files/scripts/mesa-fix_1.sh

This file was deleted.

11 changes: 0 additions & 11 deletions files/scripts/mesa-fix_2.sh

This file was deleted.

32 changes: 1 addition & 31 deletions recipes/gnome/zeliblue-deck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,37 +37,7 @@ modules:

- type: script
scripts:
- mesa-fix_1.sh

- type: rpm-ostree
replace:
- from-repo: https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite-multilib/repo/fedora-%OS_VERSION%/kylegospo-bazzite-multilib-fedora-%OS_VERSION%.repo?arch=x86_64
packages:
- mesa-libxatracker
- mesa-libglapi
- mesa-dri-drivers
- mesa-libgbm
- mesa-libEGL
- mesa-vulkan-drivers
- mesa-libGL
- pipewire
- pipewire-alsa
- pipewire-gstreamer
- pipewire-jack-audio-connection-kit
- pipewire-jack-audio-connection-kit-libs
- pipewire-libs
- pipewire-pulseaudio
- pipewire-utils
- pipewire-plugin-libcamera
- bluez
- bluez-obexd
- bluez-cups
- bluez-libs
- xorg-x11-server-Xwayland

- type: script
scripts:
- mesa-fix_2.sh
- mesa-fix.sh

- type: rpm-ostree
repos:
Expand Down

0 comments on commit 3fb2115

Please sign in to comment.