From 1506905ed25138af47d7b8f3b187f38dc7ffbf79 Mon Sep 17 00:00:00 2001
From: Jordan Pryde <jordan@pryde.me>
Date: Sat, 15 Jun 2024 18:35:36 -0700
Subject: [PATCH] Use updates repo for kernel - part 2

---
 .../etc/yum.repos.d/fedora-40-kernel.repo     | 53 +++++++++++++++++--
 recipes/fedora-kinoite-laptop.yml             |  2 +-
 2 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/config/files/etc/yum.repos.d/fedora-40-kernel.repo b/config/files/etc/yum.repos.d/fedora-40-kernel.repo
index cc599f6..b10a0ff 100644
--- a/config/files/etc/yum.repos.d/fedora-40-kernel.repo
+++ b/config/files/etc/yum.repos.d/fedora-40-kernel.repo
@@ -1,7 +1,7 @@
 [fedora-40-kernel]
-name=Fedora 40 - $basearch
+name=Fedora 40 kernel - $basearch
 #baseurl=http://download.example/pub/fedora/linux/releases/40/Everything/$basearch/os/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f40&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-40&arch=$basearch
 enabled=1
 countme=1
 metadata_expire=6h
@@ -14,9 +14,9 @@ priority=98
 skip_if_unavailable=False
 
 [fedora-40-kernel-debuginfo]
-name=Fedora 40 - $basearch - Debug
+name=Fedora 40 kernel - $basearch - Debug
 #baseurl=http://download.example/pub/fedora/linux/releases/40/Everything/$basearch/debug/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f40&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-40&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
@@ -28,7 +28,50 @@ priority=98
 skip_if_unavailable=False
 
 [fedora-40-kernel-source]
-name=Fedora 40 - Source
+name=Fedora 40 kernel - Source
+#baseurl=http://download.example/pub/fedora/linux/releases/40/Everything/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-40&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-40-$basearch
+includepkgs=kernel*
+priority=98
+skip_if_unavailable=False
+
+[fedora-40-kernel-updates]
+name=Fedora 40 kernel - Updates - $basearch
+#baseurl=http://download.example/pub/fedora/linux/releases/40/Everything/$basearch/os/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f40&arch=$basearch
+enabled=1
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-40-$basearch
+includepkgs=kernel*
+priority=98
+skip_if_unavailable=False
+
+[fedora-40-kernel-debuginfo-updates]
+name=Fedora 40 kernel - Updates - $basearch - Debug
+#baseurl=http://download.example/pub/fedora/linux/releases/40/Everything/$basearch/debug/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f40&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-40-$basearch
+includepkgs=kernel*
+priority=98
+skip_if_unavailable=False
+
+[fedora-40-kernel-source-updates]
+name=Fedora 40 kernel - Updates - Source
 #baseurl=http://download.example/pub/fedora/linux/releases/40/Everything/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f40&arch=$basearch
 enabled=0
diff --git a/recipes/fedora-kinoite-laptop.yml b/recipes/fedora-kinoite-laptop.yml
index cbc2c77..bc7e53d 100644
--- a/recipes/fedora-kinoite-laptop.yml
+++ b/recipes/fedora-kinoite-laptop.yml
@@ -44,7 +44,7 @@ modules:
     snippets:
       # the cliwrap `kernel-install` script will delete old /usr/lib/modules directories and regenerate our initramfs for us
       - rpm-ostree cliwrap install-to-root /
-      - rpm-ostree override replace kernel-modules-core kernel-modules-extra kernel-core kernel-modules kernel-headers kernel --experimental --from repo=fedora-40-kernel
+      - rpm-ostree override replace kernel-modules-core kernel-modules-extra kernel-core kernel-modules kernel-devel kernel --experimental --from repo=fedora-40-kernel-updates
 
   # Package management
   - type: rpm-ostree