From 4648703aeebb6dd48d2b2bc419bafb70d1ac852c Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 26 Oct 2026 14:16:16 -0700 Subject: [PATCH] fix: Move vhba to the extras repo where Bazzite expects it (#621) --- Containerfile.in | 2 +- build_files/{common => extra}/build-kmod-vhba.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename build_files/{common => extra}/build-kmod-vhba.sh (86%) mode change 100755 => 100644 diff --git a/Containerfile.in b/Containerfile.in index 43f9525..54a424e 100644 --- a/Containerfile.in +++ b/Containerfile.in @@ -90,7 +90,6 @@ RUN --mount=type=cache,dst=/var/cache/dnf \ set ${CI+-x} -euo pipefail /tmp/build-kmod-openrazer.sh /tmp/build-kmod-v4l2loopback.sh -/tmp/build-kmod-vhba.sh /tmp/build-kmod-wl.sh /tmp/build-kmod-xpadneo.sh /tmp/build-kmod-xone.sh @@ -120,6 +119,7 @@ set ${CI+-x} -euo pipefail /tmp/build-kmod-sc0710.sh || echo "SKIPPED: sc0710" /tmp/build-kmod-ayaneo-platform.sh || echo "SKIPPED: ayaneo-platform" /tmp/build-kmod-kvmfr.sh || echo "SKIPPED: kvmfr" +/tmp/build-kmod-vhba.sh || echo "SKIPPED: vhba" RUNEOF #elif defined NVIDIA diff --git a/build_files/common/build-kmod-vhba.sh b/build_files/extra/build-kmod-vhba.sh old mode 100755 new mode 100644 similarity index 86% rename from build_files/common/build-kmod-vhba.sh rename to build_files/extra/build-kmod-vhba.sh index d7d2798..1362659 --- a/build_files/common/build-kmod-vhba.sh +++ b/build_files/extra/build-kmod-vhba.sh @@ -20,10 +20,10 @@ akmods --force --kernels "${KERNEL}" --kmod vhba modinfo /usr/lib/modules/"${KERNEL}"/extra/vhba/vhba.ko.xz > /dev/null \ || (find /var/cache/akmods/vhba/ -name \*.log -print -exec cat {} \; && exit 1) -mkdir -p /var/cache/rpms/common -dnf download --destdir /var/cache/rpms/common \ +mkdir -p /var/cache/rpms/extra +dnf download --destdir /var/cache/rpms/extra \ vhba-kmod-common -rm -f /var/cache/rpms/common/*.src.rpm +rm -f /var/cache/rpms/extra/*.src.rpm rm -f /etc/yum.repos.d/_copr_rok-cdemu.repo