From 02f0e0d0b93ae27ecc04fe6272c88637e8b47a36 Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Tue, 12 Mar 2024 00:06:31 -0700
Subject: [PATCH 1/3] fix: Add version gating for the fsync kernel to avoid
 regressions and allow for more testing

---
 .github/workflows/build.yml |  2 +-
 build-prep.sh               | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2cbdba53..4f4c2780 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kernel_flavor: [main, asus, fsync, surface]
+        kernel_flavor: [main, asus, 6.7.9-204.fsync, surface]
         cfile_suffix: [common, nvidia]
         major_version: [38, 39]
         nvidia_version: [0, 470, 550]
diff --git a/build-prep.sh b/build-prep.sh
index a98a88b9..0fa95b42 100755
--- a/build-prep.sh
+++ b/build-prep.sh
@@ -53,20 +53,20 @@ if [[ "asus" == "${KERNEL_FLAVOR}" ]]; then
         kernel-modules \
         kernel-modules-core \
         kernel-modules-extra
-elif [[ "fsync" == "${KERNEL_FLAVOR}" ]]; then
-    echo "Installing kernel-fsync:"
+elif [[ "fsync" =~ "${KERNEL_FLAVOR}" ]]; then
+    echo "Installing kernel-fsync-${KERNEL_FLAVOR}:"
     wget https://copr.fedorainfracloud.org/coprs/sentry/kernel-fsync/repo/fedora-$(rpm -E %fedora)/sentry-kernel-fsync-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_sentry-kernel-fsync.repo
     rpm-ostree cliwrap install-to-root /
     rpm-ostree override replace \
     --experimental \
     --from repo=copr:copr.fedorainfracloud.org:sentry:kernel-fsync \
-        kernel \
-        kernel-core \
-        kernel-devel \
-        kernel-devel-matched \
-        kernel-modules \
-        kernel-modules-core \
-        kernel-modules-extra
+        kernel-"${KERNEL_FLAVOR}" \
+        kernel-core-"${KERNEL_FLAVOR}" \
+        kernel-devel-"${KERNEL_FLAVOR}" \
+        kernel-devel-matched-"${KERNEL_FLAVOR}" \
+        kernel-modules-"${KERNEL_FLAVOR}" \
+        kernel-modules-core-"${KERNEL_FLAVOR}" \
+        kernel-modules-extra-"${KERNEL_FLAVOR}"
 elif [[ "surface" == "${KERNEL_FLAVOR}" ]]; then
     echo "Installing Surface Kernel:"
     # Add Linux Surface repo

From 05267d9141ae82e3130e604f6d8e2ffbe1af68fb Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Tue, 12 Mar 2024 00:21:31 -0700
Subject: [PATCH 2/3] chore: Flip arguments for fsync

---
 build-prep.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-prep.sh b/build-prep.sh
index 0fa95b42..86f13b98 100755
--- a/build-prep.sh
+++ b/build-prep.sh
@@ -53,7 +53,7 @@ if [[ "asus" == "${KERNEL_FLAVOR}" ]]; then
         kernel-modules \
         kernel-modules-core \
         kernel-modules-extra
-elif [[ "fsync" =~ "${KERNEL_FLAVOR}" ]]; then
+elif [[ "${KERNEL_FLAVOR}" =~ "fsync" ]]; then
     echo "Installing kernel-fsync-${KERNEL_FLAVOR}:"
     wget https://copr.fedorainfracloud.org/coprs/sentry/kernel-fsync/repo/fedora-$(rpm -E %fedora)/sentry-kernel-fsync-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_sentry-kernel-fsync.repo
     rpm-ostree cliwrap install-to-root /

From 9966b14938e4ad5a1006347abb576ce74ed26154 Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Tue, 12 Mar 2024 00:27:53 -0700
Subject: [PATCH 3/3] chore: Use full version string

---
 build-prep.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/build-prep.sh b/build-prep.sh
index 86f13b98..c6d6b4d1 100755
--- a/build-prep.sh
+++ b/build-prep.sh
@@ -60,13 +60,13 @@ elif [[ "${KERNEL_FLAVOR}" =~ "fsync" ]]; then
     rpm-ostree override replace \
     --experimental \
     --from repo=copr:copr.fedorainfracloud.org:sentry:kernel-fsync \
-        kernel-"${KERNEL_FLAVOR}" \
-        kernel-core-"${KERNEL_FLAVOR}" \
-        kernel-devel-"${KERNEL_FLAVOR}" \
-        kernel-devel-matched-"${KERNEL_FLAVOR}" \
-        kernel-modules-"${KERNEL_FLAVOR}" \
-        kernel-modules-core-"${KERNEL_FLAVOR}" \
-        kernel-modules-extra-"${KERNEL_FLAVOR}"
+        kernel-"${KERNEL_FLAVOR}".fc"${RELEASE}".x86_64 \
+        kernel-core-"${KERNEL_FLAVOR}".fc"${RELEASE}".x86_64 \
+        kernel-devel-"${KERNEL_FLAVOR}".fc"${RELEASE}".x86_64 \
+        kernel-devel-matched-"${KERNEL_FLAVOR}".fc"${RELEASE}".x86_64 \
+        kernel-modules-"${KERNEL_FLAVOR}".fc"${RELEASE}".x86_64 \
+        kernel-modules-core-"${KERNEL_FLAVOR}".fc"${RELEASE}".x86_64 \
+        kernel-modules-extra-"${KERNEL_FLAVOR}".fc"${RELEASE}".x86_64
 elif [[ "surface" == "${KERNEL_FLAVOR}" ]]; then
     echo "Installing Surface Kernel:"
     # Add Linux Surface repo