From a1eb49367211049d20a6c98a593af9c4e4e09bda Mon Sep 17 00:00:00 2001
From: RJ Trujillo <rjtrujillo@protonmail.ch>
Date: Thu, 12 Oct 2023 16:13:24 -0600
Subject: [PATCH 1/3] fix(f39): Build from main instead of nokmods

nokmods is deprecated from Fedora 39 onward
---
 .github/workflows/build.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 96e200c..4b1dbdd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image_flavor: [-nokmods]
+        image_flavor: [-nokmods, -main]
         base_name: [asus]
         base_image_name:
           - silverblue
@@ -41,6 +41,12 @@ jobs:
             is_latest_version: true
             is_stable_version: true
         exclude:
+          - image_flavor: -nokmods
+            major_version: 39
+          - image_flavor: -main
+            major_version: 38
+          - image_flavor: -main
+            major_version: 37
           - base_image_name: vauxite
             major_version: 39
           - base_image_name: onyx
@@ -56,7 +62,7 @@ jobs:
       - name: Matrix Variables
         run: |
           echo "BASE_IMAGE_NAME=${{ matrix.base_image_name }}" >> $GITHUB_ENV
-          if [[ "${{ matrix.image_flavor }}" =~ "nokmods" ]]; then
+          if [[ "${{ matrix.image_flavor }}" =~ "nokmods" || "${{ matrix.image_flavor }}" =~ "main" ]]; then
               echo "IMAGE_NAME=${{ format('{0}-{1}', matrix.base_image_name, matrix.base_name) }}" >> $GITHUB_ENV
           else
               echo "IMAGE_NAME=${{ format('{0}-{1}{2}', matrix.base_image_name, matrix.base_name, matrix.image_flavor) }}" >> $GITHUB_ENV

From d89b61074efcbd0ec5d24896ce08bcbcb8ba8126 Mon Sep 17 00:00:00 2001
From: RJ Trujillo <eyecantcu@pm.me>
Date: Thu, 12 Oct 2023 20:48:35 -0600
Subject: [PATCH 2/3] fix: Don't reinstall akmods repos

---
 Containerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Containerfile b/Containerfile
index 5000328..96952c6 100644
--- a/Containerfile
+++ b/Containerfile
@@ -38,7 +38,6 @@ COPY --from=ghcr.io/ublue-os/akmods:asus-${FEDORA_MAJOR_VERSION} /rpms /tmp/akmo
 
 # Only run if FEDORA_MAJOR_VERSION is not 39
 RUN if [ ${FEDORA_MAJOR_VERSION} -lt 39 ]; then \
-    rpm-ostree install /tmp/akmods-rpms/ublue-os/ublue-os-akmods-addons*.rpm && \
     for REPO in $(rpm -ql ublue-os-akmods-addons|grep ^"/etc"|grep repo$); do \
         echo "akmods: enable default entry: ${REPO}" && \
         sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' ${REPO} \

From f22a8b5e23ac7056d4d9a65e5fda1ae501cf785a Mon Sep 17 00:00:00 2001
From: RJ Trujillo <eyecantcu@pm.me>
Date: Thu, 12 Oct 2023 20:53:59 -0600
Subject: [PATCH 3/3] fix: Don't replace kernel-devel

No longer needed
---
 Containerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Containerfile b/Containerfile
index 96952c6..3cd0f50 100644
--- a/Containerfile
+++ b/Containerfile
@@ -26,9 +26,7 @@ RUN wget https://copr.fedorainfracloud.org/coprs/lukenukem/asus-linux/repo/fedor
         kernel-core \
         kernel-modules \
         kernel-modules-core \
-        kernel-modules-extra \
-        kernel-devel \
-        kernel-devel-matched && \
+        kernel-modules-extra && \
     git clone https://gitlab.com/asus-linux/firmware.git --depth 1 /tmp/asus-firmware && \
     cp -rf /tmp/asus-firmware/* /usr/lib/firmware/ && \
     rm -rf /tmp/asus-firmware