Merge branch 'ublue-os:main' into main

.github/workflows/reusable-build.yml

@@ -62,16 +62,16 @@ jobs:
           if [[ "${{ matrix.fedora_version }}" -eq "39" ]]; then
             IS_LATEST_VERSION=false
             IS_STABLE_VERSION=true
-            IS_GTS_VERSION=true
+            IS_GTS_VERSION=false
             IS_BETA_VERSION=false
           elif [[ "${{ matrix.fedora_version }}" -eq "40" ]]; then
-            IS_LATEST_VERSION=true
+            IS_LATEST_VERSION=false
             IS_STABLE_VERSION=true
-            IS_GTS_VERSION=false
+            IS_GTS_VERSION=true
             IS_BETA_VERSION=false
           elif [[ "${{ matrix.fedora_version }}" -eq "41" ]]; then
-            IS_LATEST_VERSION=false
-            IS_STABLE_VERSION=false
+            IS_LATEST_VERSION=true
+            IS_STABLE_VERSION=true
             IS_GTS_VERSION=false
             IS_BETA_VERSION=true
           fi
@@ -132,7 +132,7 @@ jobs:
 
       - name: Get current version
         id: labels
-        uses: Wandalen/wretry.action@v3.5.0
+        uses: Wandalen/wretry.action@v3.7.0
         with:
           attempt_limit: 3
           attempt_delay: 15000
@@ -153,7 +153,7 @@ jobs:
             echo "SOURCE_IMAGE_VERSION=$ver" >> $GITHUB_ENV
 
       - name: Pull Images
-        uses: Wandalen/wretry.action@v3.5.0
+        uses: Wandalen/wretry.action@v3.7.0
         with:
           attempt_limit: 3
           attempt_delay: 15000
@@ -227,7 +227,7 @@ jobs:
           string: ${{ env.IMAGE_REGISTRY }}
 
       - name: Push To GHCR
-        uses: Wandalen/wretry.action@v3.5.0
+        uses: Wandalen/wretry.action@v3.7.0
         id: push
         if: github.event_name != 'pull_request'
         env:

install.sh

@@ -60,6 +60,16 @@ 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 remove \
+        gnome-software-rpm-ostree
+    rpm-ostree override replace \
+        --experimental \
+        --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \
+        gnome-software
+fi
+
 # run common packages script
 /ctx/packages.sh
 

packages.json

@@ -95,6 +95,10 @@
                 "libswscale-free",
                 "default-fonts-cjk-sans"
             ],
+            "silverblue": [
+                "totem-video-thumbnailer",
+                "gnome-software-rpm-ostree"
+            ],
             "kinoite": [
                 "ffmpegthumbnailer",
                 "plasma-discover-rpm-ostree"
@@ -133,7 +137,10 @@
     "41": {
         "include": {
             "all": [],
-            "kinoite": []
+            "kinoite": [
+                "kf6-kimageformats",
+                "qt6-qtimageformats"
+            ]
         },
         "exclude": {
             "all": []

sys_files/usr/share/dnf/plugins/copr.vendor.conf

@@ -0,0 +1,19 @@
+# This override is to handle the default behavior of dnf5 using ID at /etc/os-release
+# to select which chroot gets used to fetch the copr repo.
+#
+# An example of the behavior displayed without this override in Bazzite:
+# sudo dnf5 copr enable ublue-os/bling
+#  https://copr.fedorainfracloud.org/api_3/rpmrepo/ublue-os/bling/bazzite-41/                          100% | 946.0   B/s | 500.0   B |  00m01s
+# Chroot not found in the given Copr project (bazzite-41-x86_64).                                                                              You can choose one of the available chroots explicitly:
+#  fedora-38-x86_64
+#  fedora-39-x86_64
+#  fedora-40-x86_64
+#  fedora-41-x86_64
+#  fedora-rawhide-x86_64
+#
+# See:
+#   https://github.com/rpm-software-management/dnf5/blob/01d4df824ff4a94ae1fc288f81923d02ba71173a/dnf5-plugins/copr_plugin/copr_config.cpp#L79-L81
+#   https://github.com/rpm-software-management/dnf5/blob/01d4df824ff4a94ae1fc288f81923d02ba71173a/dnf5-plugins/copr_plugin/copr_repo.cpp#L146
+
+[main]
+distribution = fedora