From 0ed91c9b909dc7835b8db72ef8521e6f6582da7c Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Fri, 17 Nov 2023 00:48:25 -0800 Subject: [PATCH 1/2] feat: Add dwc3 driver for Steam Deck DRD --- Containerfile.common | 1 + build-kmod-steamdeck-dwc3.sh | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100755 build-kmod-steamdeck-dwc3.sh diff --git a/Containerfile.common b/Containerfile.common index 9771d528..9882d9c4 100644 --- a/Containerfile.common +++ b/Containerfile.common @@ -40,6 +40,7 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \ ; fi && \ if grep -qv "fsync" <<< "${KERNEL_FLAVOR}"; then \ /tmp/build-kmod-steamdeck.sh \ + /tmp/build-kmod-steamdeck-dwc3.sh \ ; fi && \ /tmp/build-kmod-gasket.sh && \ /tmp/build-kmod-gcadapter_oc.sh && \ diff --git a/build-kmod-steamdeck-dwc3.sh b/build-kmod-steamdeck-dwc3.sh new file mode 100755 index 00000000..9a6131f5 --- /dev/null +++ b/build-kmod-steamdeck-dwc3.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +set -oeux pipefail + +cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/ + +ARCH="$(rpm -E '%_arch')" +KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" +RELEASE="$(rpm -E '%fedora')" + +rpm-ostree install \ + akmod-steamdeck-dwc3-*.fc${RELEASE}.${ARCH} +akmods --force --kernels "${KERNEL}" --kmod steamdeck-dwc3 +modinfo /usr/lib/modules/${KERNEL}/extra/steamdeck-dwc3/dwc3.ko.xz > /dev/null \ +|| (find /var/cache/akmods/steamdeck/ -name \*.log -print -exec cat {} \; && exit 1) +modinfo /usr/lib/modules/${KERNEL}/extra/steamdeck-dwc3/dwc3-{pci,haps}-hwmon.ko.xz > /dev/null \ +|| (find /var/cache/akmods/steamdeck/ -name \*.log -print -exec cat {} \; && exit 1) + +rm -f /etc/yum.repos.d/_copr_ublue-os-akmods.repo From a8278285324de2b50279ab6c188f83d3e8e214ce Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Fri, 17 Nov 2023 00:56:02 -0800 Subject: [PATCH 2/2] chore: Disable gpg on Negativo repo while broken --- build-prep.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build-prep.sh b/build-prep.sh index 63ae7de2..bc8cb74d 100755 --- a/build-prep.sh +++ b/build-prep.sh @@ -14,6 +14,11 @@ else sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo fi +# Disable gpg on negativo until fixed. +if [[ -f /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-multimedia.repo ]]; then + sed -i 's@gpgcheck=1@gpgcheck=0@g' /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-multimedia.repo +fi + # enable RPMs with alternatives to create them in this image build mkdir -p /var/lib/alternatives