Merge remote-tracking branch 'nvidia/main'

.github/workflows/build.yml

@@ -31,16 +31,16 @@ jobs:
         major_version: [38, 39]
         driver_version: [470, 535]
         include:
-          - major_version: 38
+          - major_version: 39
             is_latest_version: true
             is_stable_version: true
+            is_gts_version: false
+          - major_version: 38
+            is_latest_version: false
+            is_stable_version: true
             is_gts_driver: true
           - driver_version: 535
             is_latest_driver: true
-          - major_version: 39
-            is_latest_version: true
-            is_stable_version: false
-            is_gts_version: false
         exclude:
           - image_name: onyx
             major_version: 38
@@ -163,7 +163,7 @@ jobs:
       # https://github.com/macbre/push-to-ghcr/issues/12
       - name: Lowercase Registry
         id: registry_case
-        uses: ASzc/change-string-case-action@v5
+        uses: ASzc/change-string-case-action@v6
         with:
           string: ${{ env.IMAGE_REGISTRY }}
 

Containerfile

@@ -1,13 +1,13 @@
 ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}"
 ARG BASE_IMAGE="ghcr.io/ublue-os/${IMAGE_NAME}-asus"
-ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
+ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"
 
 FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS asus-nvidia
 
 ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}"
 ARG IMAGE_VENDOR="ublue-os"
 ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-nvidia}"
-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 image-info.sh /tmp/image-info.sh

image-info.sh

@@ -6,9 +6,12 @@ IMAGE_INFO="/usr/share/ublue-os/image-info.json"
 IMAGE_REF="ostree-image-signed:docker://ghcr.io/$IMAGE_VENDOR/$IMAGE_NAME"
 
 case $FEDORA_MAJOR_VERSION in
-  38)
+  39)
     IMAGE_TAG="latest"
     ;;
+  38)
+    IMAGE_TAG="gts"
+    ;;
   *)
     IMAGE_TAG="$FEDORA_MAJOR_VERSION"
     ;;

install.sh

@@ -8,14 +8,6 @@ else
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo
 fi
 
-# force use of single rpmfusion mirror
-sed -i.bak 's%^metalink=%#metalink=%' /etc/yum.repos.d/rpmfusion-*.repo
-sed -i 's%^#baseurl=http://download1.rpmfusion.org%baseurl=http://mirrors.ocf.berkeley.edu/rpmfusion%' /etc/yum.repos.d/rpmfusion-*.repo
-# after F39 launches, bump to 40
-if [[ "${FEDORA_MAJOR_VERSION}" -ge 39 ]]; then
-    sed -i 's%free/fedora/releases%free/fedora/development%' /etc/yum.repos.d/rpmfusion-*.repo
-fi
-
 rpm-ostree install \
     /tmp/akmods-rpms/ublue-os/ublue-os-nvidia-addons-*.rpm
 
@@ -34,6 +26,3 @@ rpm-ostree install \
     xorg-x11-drv-${NVIDIA_PACKAGE_NAME}-libs.i686 \
     nvidia-container-toolkit nvidia-vaapi-driver supergfxctl ${VARIANT_PKGS} \
     /tmp/akmods-rpms/kmods/kmod-${NVIDIA_PACKAGE_NAME}-${KERNEL_VERSION}-${NVIDIA_AKMOD_VERSION}.fc${RELEASE}.rpm
-
-# reset forced use of single rpmfusion mirror
-rename -v .repo.bak .repo /etc/yum.repos.d/rpmfusion-*repo.bak

post-install.sh

@@ -4,6 +4,7 @@ set -ouex pipefail
 
 sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/{eyecantcu-supergfxctl,nvidia-container-toolkit}.repo
 
+systemctl enable ublue-nvctk-cdi.service
 semodule --verbose --install /usr/share/selinux/packages/nvidia-container.pp
 ln -s /usr/bin/ld.bfd /etc/alternatives/ld
 ln -s /etc/alternatives/ld /usr/bin/ld