fix: switch latest images to use ungated upstream kernel (#1722)

Co-authored-by: Jorge O. Castro <[email protected]> Co-authored-by: Benjamin Sherman <[email protected]>
ublue-os · Oct 6, 2024 · bab923c · bab923c
1 parent a642333
commit bab923c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
@@ -104,8 +104,6 @@ jobs:
               echo "AKMODS_FLAVOR=surface" >> $GITHUB_ENV
           elif [[ "${{ matrix.fedora_version }}" =~ stable|gts ]]; then
               echo "AKMODS_FLAVOR=coreos-stable" >> $GITHUB_ENV
-          elif [[ "${{ matrix.fedora_version }}" == "latest" ]]; then
-              echo "AKMODS_FLAVOR=fsync" >> $GITHUB_ENV
           else
               echo "AKMODS_FLAVOR=main" >> $GITHUB_ENV
           fi

diff --git a/build_files/cache_kernel.sh b/build_files/cache_kernel.sh
@@ -3,7 +3,10 @@
 set -eoux pipefail
 
 if [[ -n "${NVIDIA_TYPE:-}" ]]; then
-    rpm-ostree override replace --experimental \
+    rpm-ostree override remove \
+        kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra
+
+    rpm-ostree install \
         /tmp/kernel-rpms/kernel-[0-9]*.rpm \
         /tmp/kernel-rpms/kernel-core-*.rpm \
         /tmp/kernel-rpms/kernel-modules-*.rpm