From 53bd20584ae06b9a80b39a8735c368182f736c0e Mon Sep 17 00:00:00 2001 From: Eriq Taing Date: Fri, 3 Oct 2025 15:10:43 -0400 Subject: [PATCH] akmods-and-correct-image-info (#72) Reviewed-on: https://git.hydrosaber.com/eriq12/hydro-os/pulls/72 Co-authored-by: Eriq Taing Co-committed-by: Eriq Taing --- files/scripts/addimageinfo.sh | 2 +- files/scripts/buildakmods.sh | 7 +++++++ files/scripts/installrazermodule.sh | 2 +- files/scripts/installxpadneomodule.sh | 2 +- files/scripts/regenerateinitramfs.sh | 8 ++++++++ recipes/dnf/drivers.yml | 11 ++++------- 6 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 files/scripts/buildakmods.sh create mode 100644 files/scripts/regenerateinitramfs.sh diff --git a/files/scripts/addimageinfo.sh b/files/scripts/addimageinfo.sh index de46de4..5c0136c 100644 --- a/files/scripts/addimageinfo.sh +++ b/files/scripts/addimageinfo.sh @@ -31,7 +31,7 @@ sed -i "s|^HOME_URL=.*|HOME_URL=\"$HOME_URL\"|" /usr/lib/os-release sed -i "s|^DOCUMENTATION_URL=.*|DOCUMENTATION_URL=\"$DOCUMENTATION_URL\"|" /usr/lib/os-release sed -i "s|^SUPPORT_URL=.*|SUPPORT_URL=\"$SUPPORT_URL\"|" /usr/lib/os-release sed -i "s|^BUG_REPORT_URL=.*|BUG_REPORT_URL=\"$BUG_SUPPORT_URL\"|" /usr/lib/os-release -sed -i "s|^CPE_NAME=\"cpe:/o:fedoraproject:fedora|CPE_NAME=\"cpe:/o:wayblue:${IMAGE_PRETTY_NAME,}|" /usr/lib/os-release +sed -i "s|^CPE_NAME=\"cpe:/o:fedoraproject:fedora|CPE_NAME=\"cpe:/o:linux:${IMAGE_PRETTY_NAME,}|" /usr/lib/os-release sed -i "s/^DEFAULT_HOSTNAME=.*/DEFAULT_HOSTNAME=\"${IMAGE_PRETTY_NAME,}\"/" /usr/lib/os-release sed -i "s/^ID=fedora/ID=\"${IMAGE_LIKE,}\"\nID_LIKE=\"${IMAGE_PRETTY_NAME,}\"/" /usr/lib/os-release sed -i "/^REDHAT_BUGZILLA_PRODUCT=/d; /^REDHAT_BUGZILLA_PRODUCT_VERSION=/d; /^REDHAT_SUPPORT_PRODUCT=/d; /^REDHAT_SUPPORT_PRODUCT_VERSION=/d" /usr/lib/os-release diff --git a/files/scripts/buildakmods.sh b/files/scripts/buildakmods.sh new file mode 100644 index 0000000..44a3644 --- /dev/null +++ b/files/scripts/buildakmods.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -oue pipefail + +QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')" + +sudo akmods --kernels $QUALIFIED_KERNEL \ No newline at end of file diff --git a/files/scripts/installrazermodule.sh b/files/scripts/installrazermodule.sh index 0a561b8..d1d8ef6 100644 --- a/files/scripts/installrazermodule.sh +++ b/files/scripts/installrazermodule.sh @@ -4,7 +4,7 @@ set -oue pipefail echo "INFO: grab kernel module" -KERNEL_VER=$(ls /lib/modules | head -n 1) +KERNEL_VER="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')" echo $KERNEL_VER echo "INFO: grab open razer modules" diff --git a/files/scripts/installxpadneomodule.sh b/files/scripts/installxpadneomodule.sh index 0ad43f9..4a484b9 100644 --- a/files/scripts/installxpadneomodule.sh +++ b/files/scripts/installxpadneomodule.sh @@ -4,7 +4,7 @@ set -oue pipefail echo "INFO: grab kernel module" -KERNEL_VER=$(ls /lib/modules | head -n 1) +KERNEL_VER="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')" echo $KERNEL_VER echo "INFO: grab xpad modules" diff --git a/files/scripts/regenerateinitramfs.sh b/files/scripts/regenerateinitramfs.sh new file mode 100644 index 0000000..ddd810e --- /dev/null +++ b/files/scripts/regenerateinitramfs.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +# Obtained from wayblue project https://github.com/wayblueorg/wayblue/blob/live/files/scripts/regenerateinitramfs.sh + +set -oue pipefail + +QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')" +/usr/bin/dracut --no-hostonly --kver "$QUALIFIED_KERNEL" --reproducible -v --add ostree -f "/lib/modules/$QUALIFIED_KERNEL/initramfs.img" +chmod 0600 "/lib/modules/$QUALIFIED_KERNEL/initramfs.img" \ No newline at end of file diff --git a/recipes/dnf/drivers.yml b/recipes/dnf/drivers.yml index 3543f17..ea252ad 100644 --- a/recipes/dnf/drivers.yml +++ b/recipes/dnf/drivers.yml @@ -1,15 +1,12 @@ modules: - type: dnf repos: - files: - - https://negativo17.org/repos/fedora-steam.repo + copr: + - atim/xpadneo install: packages: - - dkms - - repo: fedora-steam - packages: - - dkms-xpadneo + - xpadneo - type: script scripts: - - installxpadneomodule.sh \ No newline at end of file + - buildakmods.sh \ No newline at end of file