From 32d3b293de54dc1f081f6ceb2ed2e310ec4d3ede Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Sat, 26 Oct 2024 22:29:15 -0500 Subject: [PATCH 1/3] feat: enable xpadneo for F41 (#260) --- build-kmod-xpadneo.sh | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/build-kmod-xpadneo.sh b/build-kmod-xpadneo.sh index 3ad92275..549e58ea 100755 --- a/build-kmod-xpadneo.sh +++ b/build-kmod-xpadneo.sh @@ -1,6 +1,6 @@ #!/bin/sh -set -oux pipefail +set -oeux pipefail ARCH="$(rpm -E '%_arch')" @@ -9,15 +9,6 @@ RELEASE="$(rpm -E '%fedora')" cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-multimedia.repo /etc/yum.repos.d/ -if [[ "${FEDORA_MAJOR_VERSION}" -ge 41 ]]; then - if dnf search akmod-xpadneo|grep -qv "akmod-xpadneo"; then - echo "Skipping build of xpadneo; net yet provided by negativo17" - exit 0 - fi -fi - -set -e pipefail - ### BUILD xpadneo (succeed or fail-fast with debug output) dnf install -y \ akmod-xpadneo-*.fc${RELEASE}.${ARCH} From a99434a1c6bb63406551f8561cfcb31ba9137339 Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Mon, 28 Oct 2024 19:22:16 -0500 Subject: [PATCH 2/3] feat: add udev rules for nvidia extra device PM (#263) --- Containerfile.nvidia | 2 +- Containerfile.nvidia-open | 2 +- files/etc/udev/rules.d/60-nvidia-extra-devices-pm.rules | 8 ++++++++ ublue-os-nvidia-addons.spec | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 files/etc/udev/rules.d/60-nvidia-extra-devices-pm.rules diff --git a/Containerfile.nvidia b/Containerfile.nvidia index 51d625ab..cca26cb5 100644 --- a/Containerfile.nvidia +++ b/Containerfile.nvidia @@ -31,7 +31,7 @@ COPY files/usr/lib/systemd/system/ublue-nvctk-cdi.service /tmp/ublue-os-nvidia-a COPY files/usr/lib/systemd/system/ublue-nvctk-cdi.service /tmp/ublue-os-ucore-nvidia/rpmbuild/SOURCES/ublue-nvctk-cdi.service COPY files/usr/lib/systemd/system-preset/70-ublue-nvctk-cdi.preset /tmp/ublue-os-nvidia-addons/rpmbuild/SOURCES/70-ublue-nvctk-cdi.preset COPY files/usr/lib/systemd/system-preset/70-ublue-nvctk-cdi.preset /tmp/ublue-os-ucore-nvidia/rpmbuild/SOURCES/70-ublue-nvctk-cdi.preset - +COPY files/etc/udev/rules.d/60-nvidia-extra-devices-pm.rules /tmp/ublue-os-nvidia-addons/rpmbuild/SOURCES/60-nvidia-extra-devices-pm.rules RUN --mount=type=cache,dst=/var/cache/dnf \ /tmp/build-prep.sh && \ diff --git a/Containerfile.nvidia-open b/Containerfile.nvidia-open index 6670e78a..e0c25203 100644 --- a/Containerfile.nvidia-open +++ b/Containerfile.nvidia-open @@ -31,7 +31,7 @@ COPY files/usr/lib/systemd/system/ublue-nvctk-cdi.service /tmp/ublue-os-nvidia-a COPY files/usr/lib/systemd/system/ublue-nvctk-cdi.service /tmp/ublue-os-ucore-nvidia/rpmbuild/SOURCES/ublue-nvctk-cdi.service COPY files/usr/lib/systemd/system-preset/70-ublue-nvctk-cdi.preset /tmp/ublue-os-nvidia-addons/rpmbuild/SOURCES/70-ublue-nvctk-cdi.preset COPY files/usr/lib/systemd/system-preset/70-ublue-nvctk-cdi.preset /tmp/ublue-os-ucore-nvidia/rpmbuild/SOURCES/70-ublue-nvctk-cdi.preset - +COPY files/etc/udev/rules.d/60-nvidia-extra-devices-pm.rules /tmp/ublue-os-nvidia-addons/rpmbuild/SOURCES/60-nvidia-extra-devices-pm.rules RUN --mount=type=cache,dst=/var/cache/dnf \ /tmp/build-prep.sh && \ diff --git a/files/etc/udev/rules.d/60-nvidia-extra-devices-pm.rules b/files/etc/udev/rules.d/60-nvidia-extra-devices-pm.rules new file mode 100644 index 00000000..fd76aff5 --- /dev/null +++ b/files/etc/udev/rules.d/60-nvidia-extra-devices-pm.rules @@ -0,0 +1,8 @@ +# Remove NVIDIA USB xHCI Host Controller devices, if present +ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{remove}="1" + +# Remove NVIDIA USB Type-C UCSI devices, if present +ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c8000", ATTR{remove}="1" + +# Remove NVIDIA Audio devices, if present +ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{remove}="1" diff --git a/ublue-os-nvidia-addons.spec b/ublue-os-nvidia-addons.spec index 5aa0544b..d91c3569 100644 --- a/ublue-os-nvidia-addons.spec +++ b/ublue-os-nvidia-addons.spec @@ -16,6 +16,7 @@ Source3: 70-ublue-nvctk-cdi.preset Source4: environment Source5: negativo17-fedora-nvidia.repo Source6: eyecantcu-supergfxctl.repo +Source7: 60-nvidia-extra-devices-pm.rules %description Adds various runtime files for nvidia support. From f64f69793bbce4bbb28b3f0249fe1ee37bfeeaca Mon Sep 17 00:00:00 2001 From: qoijjj <129108030+qoijjj@users.noreply.github.com> Date: Tue, 29 Oct 2024 18:36:26 -0700 Subject: [PATCH 3/3] chore: move coreos testing to f41 (#264) --- .github/workflows/reusable-build.yml | 2 +- build-kmod-zfs.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index dacbc6bc..ff551eb2 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -45,7 +45,7 @@ jobs: exclude: - fedora_version: 41 kernel_flavor: coreos-stable - - fedora_version: 41 + - fedora_version: 40 kernel_flavor: coreos-testing - fedora_version: 41 kernel_flavor: fsync diff --git a/build-kmod-zfs.sh b/build-kmod-zfs.sh index 9d9b7faf..b7c179a5 100755 --- a/build-kmod-zfs.sh +++ b/build-kmod-zfs.sh @@ -19,7 +19,7 @@ echo "ZFS_VERSION==$ZFS_VERSION" ### zfs specific build deps -dnf install -y libtirpc-devel libblkid-devel libuuid-devel libudev-devel openssl-devel libaio-devel libattr-devel elfutils-libelf-devel python3-devel libffi-devel libcurl-devel ncompress +dnf install -y libtirpc-devel libblkid-devel libuuid-devel libudev-devel openssl-devel libaio-devel libattr-devel elfutils-libelf-devel python3-devel libffi-devel libcurl-devel ncompress python3-setuptools ### BUILD zfs