Update various files - disable vauxite F39, try to exclude raw-thumbn…

…ailer etc

.github/workflows/build.yml

@@ -43,6 +43,8 @@ jobs:
             nvidia_version: 535
           - image_flavor: nvidia
             nvidia_version: 0
+          - image_flavor: vauxite
+            major_version: 39
     steps: 
       # Checkout push-to-registry action GitHub repository
       - name: Checkout Push to Registry action

Containerfile

@@ -1,12 +1,12 @@
 ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}"
 ARG SOURCE_IMAGE="${SOURCE_IMAGE:-silverblue}"
 ARG BASE_IMAGE="quay.io/fedora-ostree-desktops/${SOURCE_IMAGE}"
-ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
+ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"
 
 
 FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS main
 ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}"
-ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
+ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"
 
 COPY github-release-install.sh /tmp/github-release-install.sh
 COPY main-install.sh /tmp/main-install.sh
@@ -29,7 +29,7 @@ RUN mkdir -p /var/tmp && chmod -R 1777 /var/tmp
 
 FROM main AS nvidia
 ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}"
-ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
+ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"
 ARG NVIDIA_MAJOR_VERSION="${NVIDIA_MAJOR_VERSION:-535}"
 
 COPY nvidia-install.sh /tmp/nvidia-install.sh

main-install.sh

@@ -30,12 +30,16 @@ for REPO in $(rpm -ql ublue-os-akmods-addons|grep ^"/etc"|grep repo$); do
     sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' ${REPO}
 done
 
-rpm-ostree install \
-    /tmp/akmods-rpms/kmods/*openrazer*.rpm \
-    /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm \
-    /tmp/akmods-rpms/kmods/*xpadneo*.rpm \
-    /tmp/akmods-rpms/kmods/*xone*.rpm \
-    /tmp/akmods-rpms/kmods/*xpad-noone*.rpm
+# Only run if FEDORA_MAJOR_VERSION is not 39
+if grep -qv "39" <<< $FEDORA_MAJOR_VERSION; then
+    echo "HELOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"
+    rpm-ostree install \
+        /tmp/akmods-rpms/kmods/*xpadneo*.rpm \
+        /tmp/akmods-rpms/kmods/*xpad-noone*.rpm \
+        /tmp/akmods-rpms/kmods/*xone*.rpm \
+        /tmp/akmods-rpms/kmods/*openrazer*.rpm \
+        /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm
+fi
 
 for REPO in $(rpm -ql ublue-os-akmods-addons|grep ^"/etc"|grep repo$); do
     echo "akmods: disable per defaults: ${REPO}"

main-packages.json

@@ -249,5 +249,15 @@
         "exclude": {
             "all": []
         }
+    },
+    "39": {
+        "include": {
+            "all": []
+        },
+        "exclude": {
+            "all": [
+                "raw-thumbnailer"
+            ]
+        }
     }
 }