From 1c713f993f0cdf253dd96114f86f5354425c96c0 Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Sat, 2 Nov 2024 11:25:31 -0700
Subject: [PATCH 1/5] feat: Replace gnome-software with non-dkms version on F41
 and above.

---
 install.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/install.sh b/install.sh
index 767527e..519430e 100755
--- a/install.sh
+++ b/install.sh
@@ -60,6 +60,14 @@ if [[ "$FEDORA_MAJOR_VERSION" -ne "41" ]]; then
         libvdpau
 fi
 
+# Disable DKMS support in gnome-software
+if [[ "$FEDORA_MAJOR_VERSION" -ge "41" && "$IMAGE_NAME" == "silverblue" ]]; then
+    rpm-ostree override replace \
+        --experimental \
+        --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \
+        gnome-software
+fi
+
 # run common packages script
 /ctx/packages.sh
 

From abe8e90eef77785bd3bf803c95d99183400fa65e Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Sat, 2 Nov 2024 12:39:40 -0700
Subject: [PATCH 2/5] fix: Explicitly install just the base package

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

diff --git a/install.sh b/install.sh
index 519430e..83bf51e 100755
--- a/install.sh
+++ b/install.sh
@@ -65,7 +65,7 @@ if [[ "$FEDORA_MAJOR_VERSION" -ge "41" && "$IMAGE_NAME" == "silverblue" ]]; then
     rpm-ostree override replace \
         --experimental \
         --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \
-        gnome-software
+        gnome-software.x86_64
 fi
 
 # run common packages script

From 7af50083ecde9727c77496ea12e936c85f2719e9 Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Sat, 2 Nov 2024 12:57:01 -0700
Subject: [PATCH 3/5] chore: Test replacement via direct RPM

---
 install.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/install.sh b/install.sh
index 83bf51e..42c7991 100755
--- a/install.sh
+++ b/install.sh
@@ -63,9 +63,7 @@ fi
 # Disable DKMS support in gnome-software
 if [[ "$FEDORA_MAJOR_VERSION" -ge "41" && "$IMAGE_NAME" == "silverblue" ]]; then
     rpm-ostree override replace \
-        --experimental \
-        --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \
-        gnome-software.x86_64
+        https://download.copr.fedorainfracloud.org/results/ublue-os/staging/fedora-41-x86_64/08203620-gnome-software/gnome-software-47.1-100.ublue.fc41.x86_64.rpm
 fi
 
 # run common packages script

From 2403830b4f62572be227ac8a0aa490c81ac6826e Mon Sep 17 00:00:00 2001
From: Benjamin Sherman <benjamin@holyarmy.org>
Date: Tue, 5 Nov 2024 16:19:54 -0600
Subject: [PATCH 4/5] try removing gnome-software-rpm-ostree first

---
 install.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/install.sh b/install.sh
index 42c7991..92de378 100755
--- a/install.sh
+++ b/install.sh
@@ -62,6 +62,8 @@ fi
 
 # Disable DKMS support in gnome-software
 if [[ "$FEDORA_MAJOR_VERSION" -ge "41" && "$IMAGE_NAME" == "silverblue" ]]; then
+    rpm-ostree override remove \
+        gnome-software-rpm-ostree
     rpm-ostree override replace \
         https://download.copr.fedorainfracloud.org/results/ublue-os/staging/fedora-41-x86_64/08203620-gnome-software/gnome-software-47.1-100.ublue.fc41.x86_64.rpm
 fi
@@ -78,10 +80,6 @@ CSFG=/usr/lib/systemd/system-generators/coreos-sulogin-force-generator
 curl -sSLo ${CSFG} https://raw.githubusercontent.com/coreos/fedora-coreos-config/refs/heads/stable/overlay.d/05core/usr/lib/systemd/system-generators/coreos-sulogin-force-generator
 chmod +x ${CSFG}
 
-# prevent gnome software from warning about dkms secureboot as these warnings
-# would duplicate warnings provided by ublue already. we don't want confusion
-rm -f /usr/libexec/gnome-software-dkms-helper
-
 if [[ "${KERNEL_VERSION}" == "${QUALIFIED_KERNEL}" ]]; then
     /ctx/initramfs.sh
 fi

From 9ae9744d9f5301eb735e4741c2ccb61ca684f833 Mon Sep 17 00:00:00 2001
From: Benjamin Sherman <benjamin@holyarmy.org>
Date: Tue, 5 Nov 2024 16:31:53 -0600
Subject: [PATCH 5/5] can use repo based override after removing other pkg

---
 install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 92de378..28dfbab 100755
--- a/install.sh
+++ b/install.sh
@@ -65,7 +65,9 @@ if [[ "$FEDORA_MAJOR_VERSION" -ge "41" && "$IMAGE_NAME" == "silverblue" ]]; then
     rpm-ostree override remove \
         gnome-software-rpm-ostree
     rpm-ostree override replace \
-        https://download.copr.fedorainfracloud.org/results/ublue-os/staging/fedora-41-x86_64/08203620-gnome-software/gnome-software-47.1-100.ublue.fc41.x86_64.rpm
+        --experimental \
+        --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \
+        gnome-software
 fi
 
 # run common packages script