Merge branch 'main' into homebrew

Containerfile

@@ -8,9 +8,7 @@ ARG TARGET_BASE="${TARGET_BASE:-bluefin}"
 
 # FROM's for copying
 ARG KMOD_SOURCE_COMMON="ghcr.io/ublue-os/akmods:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION}"
-ARG KMOD_SOURCE_EXTRA="ghcr.io/ublue-os/akmods-extra:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION}"
-FROM ${KMOD_SOURCE_COMMON} as akmod-common
-FROM ${KMOD_SOURCE_EXTRA} as akmod-extra
+FROM ${KMOD_SOURCE_COMMON} as akmods
 FROM ghcr.io/ublue-os/bluefin-cli as bluefin-cli
 
 ## bluefin image section
@@ -36,7 +34,7 @@ COPY --from=bluefin-cli /usr/bin/atuin /usr/bin/atuin
 COPY --from=bluefin-cli /usr/share/bash-prexec /usr/share/bash-prexec
 COPY --from=bluefin-cli /home/homebrew /usr/share/homebrew
 # COPY ublue kmods, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion
-COPY --from=akmod-common /rpms /tmp/akmods-rpms
+COPY --from=akmods /rpms /tmp/akmods-rpms
 
 # Build, cleanup, commit.
 RUN rpm-ostree cliwrap install-to-root / && \
@@ -69,7 +67,7 @@ COPY system_files/dx /
 COPY packages.json /tmp/packages.json
 
 # Copy akmods-extra from ublue
-COPY --from=akmod-extra /rpms /tmp/akmods-rpms
+COPY --from=akmods /rpms /tmp/akmods-rpms
 
 # Build, Clean-up, Commit
 RUN bash -c ". /tmp/build/build-dx.sh"  && \