From 4b9b061929f99ad23ff699a08059dea6929efc1f Mon Sep 17 00:00:00 2001 From: Antheas Kapenekakis Date: Sun, 20 Oct 2024 21:37:52 +0200 Subject: [PATCH] Revert "feat: bundle akmods into resulting image" This reverts commit 0501278efaf041a31d84d241c47c19d7ef935fbc. --- build-kmod-VirtualBox.sh | 4 +--- build-kmod-ayaneo-platform.sh | 4 +--- build-kmod-ayn-platform.sh | 4 +--- build-kmod-bmi260.sh | 4 +--- build-kmod-evdi.sh | 4 +--- build-kmod-facetimehd.sh | 4 +--- build-kmod-gcadapter_oc.sh | 4 +--- build-kmod-kvmfr.sh | 4 +--- build-kmod-nct6687d.sh | 4 +--- build-kmod-nvidia.sh | 4 +--- build-kmod-openrazer.sh | 4 +--- build-kmod-rtl8814au.sh | 4 +--- build-kmod-rtl88xxau.sh | 4 +--- build-kmod-ryzen-smu.sh | 4 +--- build-kmod-v4l2loopback.sh | 4 +--- build-kmod-vhba.sh | 4 +--- build-kmod-wl.sh | 4 +--- build-kmod-xone.sh | 4 +--- build-kmod-xpadneo.sh | 4 +--- build-kmod-zenergy.sh | 4 +--- build-prep.sh | 9 ++------- 21 files changed, 22 insertions(+), 67 deletions(-) diff --git a/build-kmod-VirtualBox.sh b/build-kmod-VirtualBox.sh index 91f44ce5..fb39454c 100755 --- a/build-kmod-VirtualBox.sh +++ b/build-kmod-VirtualBox.sh @@ -8,10 +8,8 @@ RELEASE="$(rpm -E '%fedora')" ### BUILD VirtualBox (succeed or fail-fast with debug output) -dnf download -y --destdir /var/cache/rpms/akmods \ - akmod-VirtualBox-*.fc${RELEASE}.${ARCH} dnf install -y \ - /var/cache/rpms/akmods/akmod-VirtualBox-*.rpm + akmod-VirtualBox-*.fc${RELEASE}.${ARCH} akmods --force --kernels "${KERNEL}" --kmod VirtualBox modinfo /usr/lib/modules/${KERNEL}/extra/VirtualBox/{vboxdrv,vboxnetadp,vboxnetflt}.ko.xz > /dev/null \ || (find /var/cache/akmods/VirtualBox/ -name \*.log -print -exec cat {} \; && exit 1) diff --git a/build-kmod-ayaneo-platform.sh b/build-kmod-ayaneo-platform.sh index 26033357..18453756 100755 --- a/build-kmod-ayaneo-platform.sh +++ b/build-kmod-ayaneo-platform.sh @@ -8,10 +8,8 @@ RELEASE="$(rpm -E '%fedora')" cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/ -dnf download -y --destdir /var/cache/rpms/akmods \ - akmod-ayaneo-platform-*.fc${RELEASE}.${ARCH} dnf install -y \ - /var/cache/rpms/akmods/akmod-ayaneo-platform-*.rpm + akmod-ayaneo-platform-*.fc${RELEASE}.${ARCH} akmods --force --kernels "${KERNEL}" --kmod ayaneo-platform modinfo /usr/lib/modules/${KERNEL}/extra/ayaneo-platform/ayaneo-platform.ko.xz > /dev/null \ || (find /var/cache/akmods/ayaneo-platform/ -name \*.log -print -exec cat {} \; && exit 1) diff --git a/build-kmod-ayn-platform.sh b/build-kmod-ayn-platform.sh index f45ddf62..e739005e 100755 --- a/build-kmod-ayn-platform.sh +++ b/build-kmod-ayn-platform.sh @@ -8,10 +8,8 @@ RELEASE="$(rpm -E '%fedora')" cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/ -dnf download -y --destdir /var/cache/rpms/akmods \ - akmod-ayn-platform-*.fc${RELEASE}.${ARCH} dnf install -y \ - /var/cache/rpms/akmods/akmod-ayn-platform-*.rpm + akmod-ayn-platform-*.fc${RELEASE}.${ARCH} akmods --force --kernels "${KERNEL}" --kmod ayn-platform modinfo /usr/lib/modules/${KERNEL}/extra/ayn-platform/ayn-platform.ko.xz > /dev/null \ || (find /var/cache/akmods/ayn-platform/ -name \*.log -print -exec cat {} \; && exit 1) diff --git a/build-kmod-bmi260.sh b/build-kmod-bmi260.sh index f539d903..5e6f3ef2 100755 --- a/build-kmod-bmi260.sh +++ b/build-kmod-bmi260.sh @@ -8,10 +8,8 @@ RELEASE="$(rpm -E '%fedora')" cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/ -dnf download -y --destdir /var/cache/rpms/akmods \ - akmod-bmi260-*.fc${RELEASE}.${ARCH} dnf install -y \ - /var/cache/rpms/akmods/akmod-bmi260-*.rpm + akmod-bmi260-*.fc${RELEASE}.${ARCH} akmods --force --kernels "${KERNEL}" --kmod bmi260 modinfo /usr/lib/modules/${KERNEL}/extra/bmi260/bmi260_{core,i2c}.ko.xz > /dev/null \ || (find /var/cache/akmods/bmi260/ -name \*.log -print -exec cat {} \; && exit 1) diff --git a/build-kmod-evdi.sh b/build-kmod-evdi.sh index 0a35df3b..b2785f05 100755 --- a/build-kmod-evdi.sh +++ b/build-kmod-evdi.sh @@ -19,10 +19,8 @@ set -e pipefail ### BUILD evdi (succeed or fail-fast with debug output) export CFLAGS="-fno-pie -no-pie" -dnf download -y --destdir /var/cache/rpms/akmods \ - kmod-evdi*.fc"${RELEASE}.${ARCH}" akmod-evdi-*.fc"${RELEASE}.${ARCH}" dnf install -y \ - /var/cache/rpms/akmods/kmod-evdi*.rpm /var/cache/rpms/akmods/akmod-evdi-*.rpm + kmod-evdi*.fc"${RELEASE}.${ARCH}" akmod-evdi-*.fc"${RELEASE}.${ARCH}" akmods --force --kernels "${KERNEL}" --kmod evdi modinfo /usr/lib/modules/"${KERNEL}"/extra/evdi/evdi.ko.xz >/dev/null || (find /var/cache/akmods/evdi/ -name \*.log -print -exec cat {} \; && exit 1) diff --git a/build-kmod-facetimehd.sh b/build-kmod-facetimehd.sh index a4741400..d42e099c 100755 --- a/build-kmod-facetimehd.sh +++ b/build-kmod-facetimehd.sh @@ -16,10 +16,8 @@ curl -LsSf -o /etc/yum.repos.d/_copr_mulderje-facetimehd-kmod.repo \ "https://copr.fedorainfracloud.org/coprs/mulderje/facetimehd-kmod/repo/fedora-${COPR_RELEASE}/mulderje-facetimehd-kmod-fedora-${COPR_RELEASE}.repo" ### BUILD facetimehd (succeed or fail-fast with debug output) -dnf download -y --destdir /var/cache/rpms/akmods \ - akmod-facetimehd-*.fc${RELEASE}.${ARCH} dnf install -y \ - /var/cache/rpms/akmods/akmod-facetimehd-*.rpm + akmod-facetimehd-*.fc${RELEASE}.${ARCH} akmods --force --kernels "${KERNEL}" --kmod facetimehd modinfo "/usr/lib/modules/${KERNEL}/extra/facetimehd/facetimehd.ko.xz" > /dev/null \ || (find /var/cache/akmods/facetimehd/ -name \*.log -print -exec cat {} \; && exit 1) diff --git a/build-kmod-gcadapter_oc.sh b/build-kmod-gcadapter_oc.sh index d32739b4..6a51af23 100755 --- a/build-kmod-gcadapter_oc.sh +++ b/build-kmod-gcadapter_oc.sh @@ -8,10 +8,8 @@ RELEASE="$(rpm -E '%fedora')" cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/ -dnf download -y --destdir /var/cache/rpms/akmods \ - akmod-gcadapter_oc-*.fc${RELEASE}.${ARCH} dnf install -y \ - /var/cache/rpms/akmods/akmod-gcadapter_oc-*.rpm + akmod-gcadapter_oc-*.fc${RELEASE}.${ARCH} akmods --force --kernels "${KERNEL}" --kmod gcadapter_oc modinfo /usr/lib/modules/${KERNEL}/extra/gcadapter_oc/gcadapter_oc.ko.xz > /dev/null \ || (find /var/cache/akmods/gcadapter_oc/ -name \*.log -print -exec cat {} \; && exit 1) diff --git a/build-kmod-kvmfr.sh b/build-kmod-kvmfr.sh index b98ba60d..c9b6ca14 100755 --- a/build-kmod-kvmfr.sh +++ b/build-kmod-kvmfr.sh @@ -15,10 +15,8 @@ fi curl -LsSf -o /etc/yum.repos.d/_copr_hikariknight-looking-glass-kvmfr.repo "https://copr.fedorainfracloud.org/coprs/hikariknight/looking-glass-kvmfr/repo/fedora-${COPR_RELEASE}/hikariknight-looking-glass-kvmfr-fedora-${COPR_RELEASE}.repo" ### BUILD kvmfr (succeed or fail-fast with debug output) -dnf download -y --destdir /var/cache/rpms/akmods \ - "akmod-kvmfr-*.fc${RELEASE}.${ARCH}" dnf install -y \ - /var/cache/rpms/akmods/akmod-kvmfr-*.rpm + "akmod-kvmfr-*.fc${RELEASE}.${ARCH}" akmods --force --kernels "${KERNEL}" --kmod kvmfr modinfo "/usr/lib/modules/${KERNEL}/extra/kvmfr/kvmfr.ko.xz" > /dev/null \ || (find /var/cache/akmods/kvmfr/ -name \*.log -print -exec cat {} \; && exit 1) diff --git a/build-kmod-nct6687d.sh b/build-kmod-nct6687d.sh index 2d2e65d9..717cf920 100755 --- a/build-kmod-nct6687d.sh +++ b/build-kmod-nct6687d.sh @@ -9,10 +9,8 @@ RELEASE="$(rpm -E '%fedora')" cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/ ### BUILD nct6687d (succeed or fail-fast with debug output) -dnf download -y --destdir /var/cache/rpms/akmods \ - akmod-nct6687d-*.fc${RELEASE}.${ARCH} dnf install -y \ - /var/cache/rpms/akmods/akmod-nct6687d-*.rpm + akmod-nct6687d-*.fc${RELEASE}.${ARCH} akmods --force --kernels "${KERNEL}" --kmod nct6687d modinfo /usr/lib/modules/${KERNEL}/extra/nct6687d/nct6687.ko.xz > /dev/null \ || (find /var/cache/akmods/nct6687d/ -name \*.log -print -exec cat {} \; && exit 1) diff --git a/build-kmod-nvidia.sh b/build-kmod-nvidia.sh index 10ad33af..64f50fc1 100755 --- a/build-kmod-nvidia.sh +++ b/build-kmod-nvidia.sh @@ -13,10 +13,8 @@ cd /tmp sed -i 's/enabled=1/enabled=0/' /etc/yum.repos.d/rpmfusion-*.repo cp /tmp/ublue-os-nvidia-addons/rpmbuild/SOURCES/negativo17-fedora-nvidia.repo /etc/yum.repos.d/ -dnf download -y --destdir /var/cache/rpms/akmods \ - akmod-nvidia*.fc${RELEASE} dnf install -y \ - /var/cache/rpms/akmods/akmod-nvidia*.rpm + akmod-nvidia*.fc${RELEASE} # Either successfully build and install the kernel modules, or fail early with debug output rpm -qa |grep nvidia diff --git a/build-kmod-openrazer.sh b/build-kmod-openrazer.sh index 715b9add..ce10df82 100755 --- a/build-kmod-openrazer.sh +++ b/build-kmod-openrazer.sh @@ -9,10 +9,8 @@ RELEASE="$(rpm -E '%fedora')" cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/ ### BUILD openrazer (succeed or fail-fast with debug output) -dnf download -y --destdir /var/cache/rpms/akmods \ - akmod-openrazer-*.fc${RELEASE}.${ARCH} dnf install -y \ - /var/cache/rpms/akmods/akmod-openrazer-*.rpm + akmod-openrazer-*.fc${RELEASE}.${ARCH} akmods --force --kernels "${KERNEL}" --kmod openrazer modinfo /usr/lib/modules/${KERNEL}/extra/openrazer/razerkbd.ko.xz > /dev/null \ || (find /var/cache/akmods/openrazer/ -name \*.log -print -exec cat {} \; && exit 1) diff --git a/build-kmod-rtl8814au.sh b/build-kmod-rtl8814au.sh index 4a8f68e4..ca02b96b 100755 --- a/build-kmod-rtl8814au.sh +++ b/build-kmod-rtl8814au.sh @@ -13,10 +13,8 @@ fi cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/ -dnf download -y --destdir /var/cache/rpms/akmods \ - akmod-rtl8814au-*.fc${RELEASE}.${ARCH} dnf install -y \ - /var/cache/rpms/akmods/akmod-rtl8814au-*.rpm + akmod-rtl8814au-*.fc${RELEASE}.${ARCH} akmods --force --kernels "${KERNEL}" --kmod rtl8814au modinfo /usr/lib/modules/${KERNEL}/extra/rtl8814au/rtl8814au.ko.xz > /dev/null \ || (find /var/cache/akmods/rtl8814au/ -name \*.log -print -exec cat {} \; && exit 1) diff --git a/build-kmod-rtl88xxau.sh b/build-kmod-rtl88xxau.sh index e8e0b237..c508a0e4 100755 --- a/build-kmod-rtl88xxau.sh +++ b/build-kmod-rtl88xxau.sh @@ -13,10 +13,8 @@ fi cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/ -dnf download -y --destdir /var/cache/rpms/akmods \ - akmod-rtl88xxau-*.fc${RELEASE}.${ARCH} dnf install -y \ - /var/cache/rpms/akmods/akmod-rtl88xxau-*.rpm + akmod-rtl88xxau-*.fc${RELEASE}.${ARCH} akmods --force --kernels "${KERNEL}" --kmod rtl88xxau modinfo /usr/lib/modules/${KERNEL}/extra/rtl88xxau/88XXau.ko.xz > /dev/null \ || (find /var/cache/akmods/rtl88xxau/ -name \*.log -print -exec cat {} \; && exit 1) diff --git a/build-kmod-ryzen-smu.sh b/build-kmod-ryzen-smu.sh index 0c99eddb..53f08d74 100755 --- a/build-kmod-ryzen-smu.sh +++ b/build-kmod-ryzen-smu.sh @@ -9,10 +9,8 @@ RELEASE="$(rpm -E '%fedora')" cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/ ### BUILD ryzen-smu (succeed or fail-fast with debug output) -dnf download -y --destdir /var/cache/rpms/akmods \ - akmod-ryzen-smu-*.fc${RELEASE}.${ARCH} dnf install -y \ - /var/cache/rpms/akmods/akmod-ryzen-smu-*.rpm + akmod-ryzen-smu-*.fc${RELEASE}.${ARCH} akmods --force --kernels "${KERNEL}" --kmod ryzen-smu modinfo /usr/lib/modules/${KERNEL}/extra/ryzen-smu/ryzen_smu.ko.xz > /dev/null \ || (find /var/cache/akmods/ryzen-smu/ -name \*.log -print -exec cat {} \; && exit 1) diff --git a/build-kmod-v4l2loopback.sh b/build-kmod-v4l2loopback.sh index 1fed4953..023f2479 100755 --- a/build-kmod-v4l2loopback.sh +++ b/build-kmod-v4l2loopback.sh @@ -8,10 +8,8 @@ KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}') RELEASE="$(rpm -E '%fedora')" ### BUILD v4l2loopbak (succeed or fail-fast with debug output) -dnf download -y --destdir /var/cache/rpms/akmods \ - akmod-v4l2loopback-*.fc${RELEASE}.${ARCH} dnf install -y \ - /var/cache/rpms/akmods/akmod-v4l2loopback-*.rpm + akmod-v4l2loopback-*.fc${RELEASE}.${ARCH} akmods --force --kernels "${KERNEL}" --kmod v4l2loopback modinfo /usr/lib/modules/${KERNEL}/extra/v4l2loopback/v4l2loopback.ko.xz > /dev/null \ || (find /var/cache/akmods/v4l2loopback/ -name \*.log -print -exec cat {} \; && exit 1) diff --git a/build-kmod-vhba.sh b/build-kmod-vhba.sh index 62e2bb98..7b66ad51 100755 --- a/build-kmod-vhba.sh +++ b/build-kmod-vhba.sh @@ -26,10 +26,8 @@ fi curl -LsSf -o /etc/yum.repos.d/_copr_rok-cdemu.repo "https://copr.fedorainfracloud.org/coprs/rok/cdemu/repo/fedora-${COPR_RELEASE}/rok-cdemu-fedora-${COPR_RELEASE}.repo" ### BUILD vhba (succeed or fail-fast with debug output) -dnf download -y --destdir /var/cache/rpms/akmods \ - akmod-vhba-*.fc${RELEASE}.${ARCH} dnf install -y \ - /var/cache/rpms/akmods/akmod-vhba-*.rpm + akmod-vhba-*.fc${RELEASE}.${ARCH} akmods --force --kernels "${KERNEL}" --kmod vhba modinfo /usr/lib/modules/${KERNEL}/extra/vhba/vhba.ko.xz > /dev/null \ || (find /var/cache/akmods/vhba/ -name \*.log -print -exec cat {} \; && exit 1) diff --git a/build-kmod-wl.sh b/build-kmod-wl.sh index b38c76e8..4027fcc8 100755 --- a/build-kmod-wl.sh +++ b/build-kmod-wl.sh @@ -9,10 +9,8 @@ RELEASE="$(rpm -E '%fedora')" ### BUILD wl (succeed or fail-fast with debug output) -dnf download -y --destdir /var/cache/rpms/akmods \ - akmod-wl-*.fc${RELEASE}.${ARCH} dnf install -y \ - /var/cache/rpms/akmods/akmod-wl-*.rpm + akmod-wl-*.fc${RELEASE}.${ARCH} akmods --force --kernels "${KERNEL}" --kmod wl modinfo /usr/lib/modules/${KERNEL}/extra/wl/wl.ko.xz > /dev/null \ || (find /var/cache/akmods/wl/ -name \*.log -print -exec cat {} \; && exit 1) diff --git a/build-kmod-xone.sh b/build-kmod-xone.sh index f89651dc..705d753c 100755 --- a/build-kmod-xone.sh +++ b/build-kmod-xone.sh @@ -9,10 +9,8 @@ RELEASE="$(rpm -E '%fedora')" cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/ ### BUILD xone (succeed or fail-fast with debug output) -dnf download -y --destdir /var/cache/rpms/akmods \ - akmod-xone-*.fc${RELEASE}.${ARCH} dnf install -y \ - /var/cache/rpms/akmods/akmod-xone-*.rpm + akmod-xone-*.fc${RELEASE}.${ARCH} akmods --force --kernels "${KERNEL}" --kmod xone modinfo /usr/lib/modules/${KERNEL}/extra/xone/xone-{dongle,gip,gip-gamepad,gip-headset,gip-chatpad,gip-madcatz-strat,gip-madcatz-glam,gip-pdp-jaguar}.ko.xz > /dev/null \ || (find /var/cache/akmods/xone/ -name \*.log -print -exec cat {} \; && exit 1) diff --git a/build-kmod-xpadneo.sh b/build-kmod-xpadneo.sh index 55b8ff50..3ad92275 100755 --- a/build-kmod-xpadneo.sh +++ b/build-kmod-xpadneo.sh @@ -19,10 +19,8 @@ fi set -e pipefail ### BUILD xpadneo (succeed or fail-fast with debug output) -dnf download -y --destdir /var/cache/rpms/akmods \ - akmod-xpadneo-*.fc${RELEASE}.${ARCH} dnf install -y \ - /var/cache/rpms/akmods/akmod-xpadneo-*.rpm + akmod-xpadneo-*.fc${RELEASE}.${ARCH} 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) diff --git a/build-kmod-zenergy.sh b/build-kmod-zenergy.sh index 84708f02..0dd7d46f 100755 --- a/build-kmod-zenergy.sh +++ b/build-kmod-zenergy.sh @@ -8,10 +8,8 @@ RELEASE="$(rpm -E '%fedora')" cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/ -dnf download -y --destdir /var/cache/rpms/akmods \ - akmod-zenergy-*.fc${RELEASE}.${ARCH} dnf install -y \ - /var/cache/rpms/akmods/akmod-zenergy-*.rpm + akmod-zenergy-*.fc${RELEASE}.${ARCH} akmods --force --kernels "${KERNEL}" --kmod zenergy modinfo /usr/lib/modules/${KERNEL}/extra/zenergy/zenergy.ko.xz > /dev/null \ || (find /var/cache/akmods/zenergy/ -name \*.log -print -exec cat {} \; && exit 1) diff --git a/build-prep.sh b/build-prep.sh index 24986575..f1d0f756 100755 --- a/build-prep.sh +++ b/build-prep.sh @@ -50,12 +50,7 @@ fi ### PREPARE BUILD ENV dnf install -y \ akmods \ - mock \ - ruby-devel - -# FPM is needed to rename akmods, gem provided by ruby-devel -gem install fpm - + mock if [[ ! -s "/tmp/certs/private_key.priv" ]]; then echo "WARNING: Using test signing key. Run './generate-akmods-key' for production builds." @@ -98,4 +93,4 @@ fi chmod 1777 /tmp /var/tmp # create directories for later copying resulting artifacts -mkdir -p /var/cache/rpms/{akmods,kmods,ublue-os,ucore} +mkdir -p /var/cache/rpms/{kmods,ublue-os,ucore}