From 1fd1ad78a43998377f43c04738895b085cdc97ba Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 17 Jul 2023 10:42:55 -0700 Subject: [PATCH] fix: Use existing ublue-os/akmods repo file instead of redownloading, fix removed file for negativo17 repo akmods --- build-kmod-gcadapter_oc.sh | 4 ++-- build-kmod-steamdeck.sh | 4 ++-- build-kmod-xone.sh | 2 +- build-kmod-xpadneo.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-kmod-gcadapter_oc.sh b/build-kmod-gcadapter_oc.sh index 87dcf4de..ac9792a1 100755 --- a/build-kmod-gcadapter_oc.sh +++ b/build-kmod-gcadapter_oc.sh @@ -2,12 +2,12 @@ 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 --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" RELEASE="$(rpm -E '%fedora')" -wget https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/repo/fedora-${RELEASE}/ublue-os-akmods-fedora-${RELEASE}.repo -O /etc/yum.repos.d/_copr_ublue-os-akmods.repo - rpm-ostree install \ akmod-gcadapter_oc-*.fc${RELEASE}.${ARCH} akmods --force --kernels "${KERNEL}" --kmod gcadapter_oc diff --git a/build-kmod-steamdeck.sh b/build-kmod-steamdeck.sh index 8b709cf6..e4f6bf77 100755 --- a/build-kmod-steamdeck.sh +++ b/build-kmod-steamdeck.sh @@ -2,12 +2,12 @@ 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 --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" RELEASE="$(rpm -E '%fedora')" -wget https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/repo/fedora-${RELEASE}/ublue-os-akmods-fedora-${RELEASE}.repo -O /etc/yum.repos.d/_copr_ublue-os-akmods.repo - rpm-ostree install \ akmod-steamdeck-*.fc${RELEASE}.${ARCH} akmods --force --kernels "${KERNEL}" --kmod steamdeck diff --git a/build-kmod-xone.sh b/build-kmod-xone.sh index b3c8d4c7..0fe8aa72 100755 --- a/build-kmod-xone.sh +++ b/build-kmod-xone.sh @@ -17,4 +17,4 @@ akmods --force --kernels "${KERNEL}" --kmod xone modinfo /usr/lib/modules/${KERNEL}/extra/xone/xone-{dongle,gip-chatpad,gip-gamepad,gip-guitar,gip-headset,gip,wired}.ko.xz > /dev/null \ || (find /var/cache/akmods/xone/ -name \*.log -print -exec cat {} \; && exit 1) -rm -f /etc/yum.repos.d/fedora-steam.repo +rm -f /etc/yum.repos.d/negativo17-fedora-steam.repo diff --git a/build-kmod-xpadneo.sh b/build-kmod-xpadneo.sh index 2b33ce54..145f4f53 100755 --- a/build-kmod-xpadneo.sh +++ b/build-kmod-xpadneo.sh @@ -17,4 +17,4 @@ akmods --force --kernels "${KERNEL}" --kmod xpadneo modinfo /usr/lib/modules/${KERNEL}/extra/xpadneo/hid-xpadneo.ko.xz > /dev/null \ || (find /var/cache/akmods/xpadneo/ -name \*.log -print -exec cat {} \; && exit 1) -rm -f /etc/yum.repos.d/fedora-steam.repo +rm -f /etc/yum.repos.d/negativo17-fedora-steam.repo