Merge pull request #107 from ublue-os/main

[pull] main from ublue-os:main

Author: pull[bot]

.github/workflows/build.yml

@@ -71,7 +71,7 @@ jobs:
             is_latest_version: true
             is_stable_version: true
             kernel_flavor: bazzite # must match a kernel_flavor from akmods repo
-            kernel_version: 6.13.5-102.bazzite.fc41.x86_64 # must match a cached version of the above flavor
+            kernel_version: 6.13.6-102.bazzite.fc41.x86_64 # must match a cached version of the above flavor
         exclude:
           - base_name: bazzite-deck-nvidia
           - base_name: bazzite
@@ -212,7 +212,7 @@ jobs:
             sudo podman pull ${{ env.PULL_IMAGE_REGISTRY }}/akmods-${{ matrix.target_nvidia_flavor }}:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }}-${{ matrix.kernel_version }}
 
             # Add rechunk as well to remove this source of failure
-            sudo podman pull ghcr.io/hhd-dev/rechunk:v1.1.3
+            sudo podman pull ghcr.io/hhd-dev/rechunk:v1.2.1
 
       - name: Get source versions
         id: labels
@@ -264,26 +264,33 @@ jobs:
           echo "Generated the following:"
           cat $GITHUB_OUTPUT
 
+      # Generate a file with all the build-args passed to buildah
+      - name: Prepare build args file
+        run: |
+          cat <<'EOF' >>build_args.txt
+          IMAGE_NAME=${{ env.IMAGE_NAME }}
+          IMAGE_FLAVOR=${{ env.IMAGE_FLAVOR }}
+          NVIDIA_FLAVOR=${{ matrix.target_nvidia_flavor }}
+          NVIDIA_BASE=${{ env.NVIDIA_BASE }}
+          IMAGE_VENDOR=${{ github.repository_owner }}
+          BASE_IMAGE_NAME=${{ matrix.base_image_name }}
+          BASE_IMAGE_FLAVOR=${{ matrix.base_image_flavor }}
+          FEDORA_VERSION=${{ matrix.fedora_version }}
+          KERNEL_FLAVOR=${{ matrix.kernel_flavor }}
+          KERNEL_VERSION=${{ matrix.kernel_version }}
+          IMAGE_BRANCH=${{ github.ref_name }}
+          SHA_HEAD_SHORT=${{ env.SHA_HEAD_SHORT }}
+          VERSION_TAG=${{ steps.generate-version.outputs.tag }}
+          VERSION_PRETTY=${{ steps.generate-version.outputs.pretty }}
+          EOF
+
       # Build image using buildah and save it to raw-img
       - name: Build Image
         id: build_image
         run: |
           sudo buildah build \
             --target ${{ env.CONTAINER_TARGET }} \
-            --build-arg IMAGE_NAME=${{ env.IMAGE_NAME }} \
-            --build-arg IMAGE_FLAVOR=${{ env.IMAGE_FLAVOR }} \
-            --build-arg NVIDIA_FLAVOR=${{ matrix.target_nvidia_flavor }} \
-            --build-arg NVIDIA_BASE=${{ env.NVIDIA_BASE }} \
-            --build-arg IMAGE_VENDOR=${{ github.repository_owner }} \
-            --build-arg BASE_IMAGE_NAME=${{ matrix.base_image_name }} \
-            --build-arg BASE_IMAGE_FLAVOR=${{ matrix.base_image_flavor }} \
-            --build-arg FEDORA_VERSION=${{ matrix.fedora_version }} \
-            --build-arg KERNEL_FLAVOR=${{ matrix.kernel_flavor }} \
-            --build-arg KERNEL_VERSION=${{ matrix.kernel_version }} \
-            --build-arg IMAGE_BRANCH=${{ github.ref_name }} \
-            --build-arg SHA_HEAD_SHORT=${{ env.SHA_HEAD_SHORT }} \
-            --build-arg VERSION_TAG=${{ steps.generate-version.outputs.tag }} \
-            --build-arg VERSION_PRETTY="${{ steps.generate-version.outputs.pretty }}" \
+            --build-arg-file build_args.txt \
             --tag raw-img .
       
       - name: Remove auxiliary images
@@ -332,9 +339,9 @@ jobs:
       # Reprocess raw-img using rechunker which will delete it
       - name: Run Rechunker
         id: rechunk
-        uses: hhd-dev/rechunk@v1.1.3
+        uses: hhd-dev/rechunk@v1.2.1
         with:
-          rechunk: 'ghcr.io/hhd-dev/rechunk:v1.1.3'
+          rechunk: 'ghcr.io/hhd-dev/rechunk:v1.2.1'
           ref: 'raw-img'
           prev-ref: '${{ steps.generate-prev-ref.outputs.ref }}'
           version: '${{ steps.generate-version.outputs.tag }}'

Containerfile

@@ -132,6 +132,9 @@ RUN --mount=type=cache,dst=/var/cache/libdnf5 \
     --mount=type=bind,from=ctx,source=/,target=/ctx \
     --mount=type=tmpfs,dst=/tmp \
     /ctx/install-kernel-akmods && \
+    for toswap in linux-firmware netronome-firmware libertas-firmware atheros-firmware realtek-firmware tiwilink-firmware cirrus-audio-firmware linux-firmware-whence iwlwifi-dvm-firmware iwlwifi-mvm-firmware amd-ucode-firmware qcom-firmware mt7xxx-firmware liquidio-firmware nxpwireless-firmware intel-vsc-firmware nvidia-gpu-firmware intel-audio-firmware amd-gpu-firmware iwlegacy-firmware intel-gpu-firmware mlxsw_spectrum-firmware qed-firmware mrvlprestera-firmware brcmfmac-firmware dvb-firmware; do \
+        dnf5 -y swap --repo copr:copr.fedorainfracloud.org:kylegospo:bazzite $toswap $toswap; \
+    done && unset -v toswap && \
     dnf5 -y config-manager setopt "*rpmfusion*".enabled=0 && \
     dnf5 -y copr enable bieszczaders/kernel-cachyos-addons && \
     dnf5 -y install \
@@ -209,7 +212,6 @@ RUN --mount=type=cache,dst=/var/cache/libdnf5 \
         mesa-libEGL \
         mesa-libGL \
         mesa-libgbm \
-        mesa-libglapi \
         mesa-va-drivers \
         mesa-vulkan-drivers \
         fwupd \
@@ -336,6 +338,11 @@ RUN --mount=type=cache,dst=/var/cache/libdnf5 \
     tar --no-same-owner --no-same-permissions --no-overwrite-dir -xvzf /tmp/ls-iommu.tar.gz -C /tmp/ls-iommu && \
     rm -f /tmp/ls-iommu.tar.gz && \
     cp -r /tmp/ls-iommu/ls-iommu /usr/bin/ && \
+    curl -Lo /tmp/scopebuddy.tar.gz https://github.com/HikariKnight/ScopeBuddy/archive/refs/tags/$(curl https://api.github.com/repos/HikariKnight/scopebuddy/releases/latest | jq -r '.tag_name').tar.gz && \
+    mkdir -p /tmp/scopebuddy && \
+    tar --no-same-owner --no-same-permissions --no-overwrite-dir -xvzf /tmp/scopebuddy.tar.gz -C /tmp/scopebuddy && \
+    rm -f /tmp/scopebuddy.tar.gz && \
+    cp -r /tmp/scopebuddy/ScopeBuddy-*/bin/* /usr/bin/ && \
     /ctx/cleanup
 
 # Install Steam & Lutris, plus supporting packages

build_files/install-kernel-akmods

@@ -16,15 +16,14 @@ dnf5 -y install \
 
 dnf5 versionlock add kernel kernel-devel kernel-devel-matched kernel-core kernel-modules kernel-modules-core kernel-modules-extra kernel-uki-virt
 
-shopt -s nullglob
 dnf5 -y install \
     /tmp/akmods-rpms/kmods/*kvmfr*.rpm \
     /tmp/akmods-rpms/kmods/*xone*.rpm \
     /tmp/akmods-rpms/kmods/*openrazer*.rpm \
     /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm \
     /tmp/akmods-rpms/kmods/*wl*.rpm \
-    /tmp/akmods-rpms/kmods/*nct6687*.rpm \
     /tmp/akmods-rpms/kmods/*framework-laptop*.rpm \
+    /tmp/akmods-extra-rpms/kmods/*nct6687*.rpm \
     /tmp/akmods-extra-rpms/kmods/*gcadapter_oc*.rpm \
     /tmp/akmods-extra-rpms/kmods/*zenergy*.rpm \
     /tmp/akmods-extra-rpms/kmods/*vhba*.rpm \

spec_files/gsettings-desktop-schemas/99.patch

@@ -13,7 +13,7 @@ URL:            https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas
 Source0:        https://download.gnome.org/sources/%{name}/47/%{name}-%{tarball_version}.tar.xz
 Source1:        org.gnome.desktop.interface.rhel.gschema.override
 
-Patch:          99.patch
+Patch:          https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/merge_requests/99.patch
 
 BuildRequires:  gettext
 BuildRequires:  glib2-devel >= 2.31.0

spec_files/gsettings-desktop-schemas/gsettings-desktop-schemas.spec

@@ -10,7 +10,7 @@
 
 %global appname MangoHud
 %global forgeurl https://github.com/flightlessmango/MangoHud
-%global commit f77864d5ee59a82c33220267bf47fe0b82eafdad
+%global commit fea4292519a3085881d567a18ad3e1fee37078d8
 %forgemeta
 %global imgui_ver 1.89.9
 %global imgui_wrap_ver 2
@@ -22,8 +22,8 @@
 %global tarball_version %%(echo %{version} | tr '~' '-')
 
 Name:           mangohud
-Version:        0.8.0
-Release:        4
+Version:        0.8.1
+Release:        %autorelease
 Summary:        Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load
 
 License:        MIT
@@ -40,17 +40,6 @@ Source5:        https://github.com/epezent/implot/archive/v%{implot_ver}/implot-
 Source6:        https://wrapdb.mesonbuild.com/v%{implot_wrap_ver}/implot_%{implot_ver}-1/get_patch#/implot-%{implot_ver}-%{implot_wrap_ver}-wrap.zip
 Source20:       README.Fedora.md
 
-# https://github.com/flightlessmango/MangoHud/commit/85bd029f2f292e2a7089caff6c78d79a102da96d
-Patch0:         85bd029f2f292e2a7089caff6c78d79a102da96d.patch
-# https://github.com/flightlessmango/MangoHud/pull/1581
-Patch1:         1581.patch
-# https://github.com/flightlessmango/MangoHud/commit/6dcd1b5c4bbd9fa1ff56337bff6d307568afc4d5
-Patch2:         6dcd1b5c4bbd9fa1ff56337bff6d307568afc4d5.patch
-# https://github.com/flightlessmango/MangoHud/commit/f60145c288610145b172af4f0dff49697337abc4
-Patch3:         f60145c288610145b172af4f0dff49697337abc4.patch
-# https://github.com/flightlessmango/MangoHud/commit/5b7bd93f0493e88637ff4a6ef1140a13ded05cc8
-Patch4:         5b7bd93f0493e88637ff4a6ef1140a13ded05cc8.patch
-
 BuildRequires:  vulkan-headers
 BuildRequires:  appstream
 BuildRequires:  dbus-devel