diff --git a/config/recipe.yml b/config/recipe.yml index b61c6b1..66c9092 100644 --- a/config/recipe.yml +++ b/config/recipe.yml @@ -17,11 +17,6 @@ modules: # put configuration files you want in /etc/ on a booted system # in /usr/etc/ in the image. read more in files module reference. - - type: akmods - base: main - install: - - wl - - type: rpm-ostree repos: - https://copr.fedorainfracloud.org/coprs/mulderje/facetimehd-kmod/repo/fedora-%OS_VERSION%/mulderje-facetimehd-kmod-fedora-%OS_VERSION%.repo @@ -36,9 +31,11 @@ modules: - firefox - firefox-langpacks - - type: script - scripts: - - build-kmod-facetimehd.sh + - type: akmods + base: main + install: + - facetimehd + - wl - type: default-flatpaks notify: true # Send notification after install/uninstall is finished (true/false) diff --git a/config/scripts/build-kmod-facetimehd.sh b/config/scripts/build-kmod-facetimehd.sh deleted file mode 100644 index b32bf75..0000000 --- a/config/scripts/build-kmod-facetimehd.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -set -oeux pipefail - -mkdir -p /tmp /var/tmp /var/lib/alternatives /var/cache/rpms/kmods -chmod -R 1777 /var/tmp - -# From: https://github.com/ublue-os/akmods/pull/158#issuecomment-2030445267 -# alternatives cannot create symlinks on its own during a container build -ln -sf /usr/bin/ld.bfd /etc/alternatives/ld && ln -sf /etc/alternatives/ld /usr/bin/ld - -ARCH="$(rpm -E '%_arch')" -KERNEL="$(rpm -q "${KERNEL_NAME:-kernel}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" -RELEASE="$(rpm -E '%fedora')" - -if [[ "${RELEASE}" -ge 41 ]]; then - COPR_RELEASE="rawhide" -else - COPR_RELEASE="${RELEASE}" -fi - -wget "https://copr.fedorainfracloud.org/coprs/mulderje/facetimehd-kmod/repo/fedora-${COPR_RELEASE}/mulderje-facetimehd-kmod-fedora-${COPR_RELEASE}.repo" -O /etc/yum.repos.d/_copr_mulderje-facetimehd-kmod.repo - -rpm-ostree install akmods mock - -### BUILD facetimehd (succeed or fail-fast with debug output) -rpm-ostree install \ - 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) - -rm -f /etc/yum.repos.d/_copr_mulderje-facetimehd-kmod.repo