diff --git a/Containerfile.common b/Containerfile.common index 7e17ffdf..9771d528 100644 --- a/Containerfile.common +++ b/Containerfile.common @@ -39,8 +39,7 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \ /tmp/build-kmod-evdi.sh \ ; fi && \ if grep -qv "fsync" <<< "${KERNEL_FLAVOR}"; then \ - /tmp/build-kmod-steamdeck.sh && \ - /tmp/build-kmod-steamdeck-dwc3.sh \ + /tmp/build-kmod-steamdeck.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 deleted file mode 100755 index 9a6131f5..00000000 --- a/build-kmod-steamdeck-dwc3.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/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 diff --git a/build-prep.sh b/build-prep.sh index bc8cb74d..63ae7de2 100755 --- a/build-prep.sh +++ b/build-prep.sh @@ -14,11 +14,6 @@ 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