From 84086bab3ea97541f9fb7de2757483bec6d9f342 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Sun, 18 Jun 2023 21:37:09 +0100 Subject: [PATCH 1/8] Enable driver builds for v535 --- .github/workflows/build.yml | 12 +++++++----- build.sh | 5 ++++- install.sh | 3 +++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fc7fbf2..b79a60b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,18 +20,20 @@ jobs: fail-fast: false matrix: major_version: [37, 38] - driver_version: [520, 525, 530, 470] + driver_version: [470, 520, 525, 530, 535] exclude: - - driver_version: 525 - major_version: 37 - - driver_version: 525 + - driver_version: 470 major_version: 38 - driver_version: 520 major_version: 37 - driver_version: 520 major_version: 38 - - driver_version: 470 + - driver_version: 525 + major_version: 37 + - driver_version: 525 major_version: 38 + - driver_version: 535 + major_version: 37 steps: # Checkout push-to-registry action GitHub repository - name: Checkout Push to Registry action diff --git a/build.sh b/build.sh index 2edb38d..85083dd 100755 --- a/build.sh +++ b/build.sh @@ -5,6 +5,9 @@ set -oeux pipefail RELEASE="$(rpm -E '%fedora.%_arch')" sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-{cisco-openh264,modular,updates-modular}.repo +# Enable the RPM Fusion testing repositories for NVIDIA 535 +# https://rpmfind.net/linux/rpm2html/search.php?query=akmod-nvidia +sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/rpmfusion-{free,nonfree}-updates-testing.repo # nvidia 520.xxx and newer currently don't have a -$VERSIONxx suffix in their # package names @@ -15,7 +18,7 @@ else fi rpm-ostree install \ - akmod-${NVIDIA_PACKAGE_NAME}*:${NVIDIA_MAJOR_VERSION}.*.fc${RELEASE} \ + akmod-${NVIDIA_PACKAGE_NAME}-${NVIDIA_MAJOR_VERSION}.*.fc${RELEASE} \ xorg-x11-drv-${NVIDIA_PACKAGE_NAME}-{,cuda,devel,kmodsrc,power}*:${NVIDIA_MAJOR_VERSION}.*.fc${RELEASE} \ mock diff --git a/install.sh b/install.sh index 59ade51..5ee3095 100755 --- a/install.sh +++ b/install.sh @@ -3,6 +3,9 @@ set -ouex pipefail sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-{cisco-openh264,modular,updates-modular}.repo +# Enable the RPM Fusion testing repositories for NVIDIA 535 +# https://rpmfind.net/linux/rpm2html/search.php?query=akmod-nvidia +sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/rpmfusion-{free,nonfree}-updates-testing.repo install -D /tmp/ublue-os-nvidia-addons/rpmbuild/SOURCES/nvidia-container-runtime.repo \ /etc/yum.repos.d/nvidia-container-runtime.repo From 5436932c66e3704c0c46231fee68e29a68d26032 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Sun, 18 Jun 2023 21:42:04 +0100 Subject: [PATCH 2/8] Remove v520 and v525 since they aren't being built for either supported Fedora version --- .github/workflows/build.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b79a60b..d443f43 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,18 +20,10 @@ jobs: fail-fast: false matrix: major_version: [37, 38] - driver_version: [470, 520, 525, 530, 535] + driver_version: [470, 530, 535] exclude: - driver_version: 470 major_version: 38 - - driver_version: 520 - major_version: 37 - - driver_version: 520 - major_version: 38 - - driver_version: 525 - major_version: 37 - - driver_version: 525 - major_version: 38 - driver_version: 535 major_version: 37 steps: From 506cf8f859adae9d1ea282592830f41b557c5744 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Sun, 18 Jun 2023 22:05:46 +0100 Subject: [PATCH 3/8] Enable push-ghcr to build v535 --- .github/workflows/build.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d443f43..7152082 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -176,32 +176,21 @@ jobs: matrix: image_name: [silverblue, kinoite, vauxite, sericea, base, lxqt, mate] major_version: [37, 38] - driver_version: [520, 525, 530, 470] + driver_version: [470, 530, 535] include: - # - major_version: 36 - # is_latest_version: false - # is_stable_version: true - major_version: 37 is_latest_version: false is_stable_version: true - major_version: 38 is_latest_version: true is_stable_version: true - - driver_version: 530 + - driver_version: 535 is_latest_driver: true exclude: # There is no Fedora 37 version of sericea # When F38 is added, sericea will automatically be built too - image_name: sericea major_version: 37 - - driver_version: 525 - major_version: 37 - - driver_version: 525 - major_version: 38 - - driver_version: 520 - major_version: 37 - - driver_version: 520 - major_version: 38 - driver_version: 470 major_version: 38 steps: From a3cabb00051ba6d9efea2ea4c0e466c95f9a7fda Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Sun, 18 Jun 2023 22:06:12 +0100 Subject: [PATCH 4/8] The packages for v535 are included in Fedora 37 --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7152082..3b7aeb0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,8 +24,6 @@ jobs: exclude: - driver_version: 470 major_version: 38 - - driver_version: 535 - major_version: 37 steps: # Checkout push-to-registry action GitHub repository - name: Checkout Push to Registry action From 8a65dec2c3197a279b8d9c2c2a7de3e928417651 Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 23 Jun 2023 20:22:18 +0100 Subject: [PATCH 5/8] remove testing repos from builds --- build.sh | 3 --- install.sh | 3 --- 2 files changed, 6 deletions(-) diff --git a/build.sh b/build.sh index 85083dd..cadf93a 100755 --- a/build.sh +++ b/build.sh @@ -5,9 +5,6 @@ set -oeux pipefail RELEASE="$(rpm -E '%fedora.%_arch')" sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-{cisco-openh264,modular,updates-modular}.repo -# Enable the RPM Fusion testing repositories for NVIDIA 535 -# https://rpmfind.net/linux/rpm2html/search.php?query=akmod-nvidia -sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/rpmfusion-{free,nonfree}-updates-testing.repo # nvidia 520.xxx and newer currently don't have a -$VERSIONxx suffix in their # package names diff --git a/install.sh b/install.sh index 5ee3095..59ade51 100755 --- a/install.sh +++ b/install.sh @@ -3,9 +3,6 @@ set -ouex pipefail sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-{cisco-openh264,modular,updates-modular}.repo -# Enable the RPM Fusion testing repositories for NVIDIA 535 -# https://rpmfind.net/linux/rpm2html/search.php?query=akmod-nvidia -sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/rpmfusion-{free,nonfree}-updates-testing.repo install -D /tmp/ublue-os-nvidia-addons/rpmbuild/SOURCES/nvidia-container-runtime.repo \ /etc/yum.repos.d/nvidia-container-runtime.repo From eddc6c0a2bdec2b2f90e402bf9f1ea827b884ac5 Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 23 Jun 2023 20:32:12 +0100 Subject: [PATCH 6/8] reset akmod-nvidia package filters --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index cadf93a..2edb38d 100755 --- a/build.sh +++ b/build.sh @@ -15,7 +15,7 @@ else fi rpm-ostree install \ - akmod-${NVIDIA_PACKAGE_NAME}-${NVIDIA_MAJOR_VERSION}.*.fc${RELEASE} \ + akmod-${NVIDIA_PACKAGE_NAME}*:${NVIDIA_MAJOR_VERSION}.*.fc${RELEASE} \ xorg-x11-drv-${NVIDIA_PACKAGE_NAME}-{,cuda,devel,kmodsrc,power}*:${NVIDIA_MAJOR_VERSION}.*.fc${RELEASE} \ mock From b866d1225070da6a6357cdd6c1767e4c4cbda52b Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 23 Jun 2023 21:15:16 +0100 Subject: [PATCH 7/8] Set F38 v535 as defaults in Containerfiles --- build.Containerfile | 4 ++-- install.Containerfile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.Containerfile b/build.Containerfile index bd53d59..76e5507 100644 --- a/build.Containerfile +++ b/build.Containerfile @@ -1,10 +1,10 @@ ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}" ARG BASE_IMAGE="ghcr.io/ublue-os/${IMAGE_NAME}-main" -ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-37}" +ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}" FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS builder -ARG NVIDIA_MAJOR_VERSION="${NVIDIA_MAJOR_VERSION:-525}" +ARG NVIDIA_MAJOR_VERSION="${NVIDIA_MAJOR_VERSION:-535}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}" RUN ln -s /usr/bin/rpm-ostree /usr/bin/dnf diff --git a/install.Containerfile b/install.Containerfile index 4b58766..5f99cb2 100644 --- a/install.Containerfile +++ b/install.Containerfile @@ -1,14 +1,14 @@ ARG IMAGE_NAME=silverblue ARG BASE_IMAGE=ghcr.io/ublue-os/${IMAGE_NAME}-main -ARG FEDORA_MAJOR_VERSION=37 +ARG FEDORA_MAJOR_VERSION=38 FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} ARG IMAGE_NAME="${IMAGE_NAME}" ARG AKMODS_CACHE="ghcr.io/ublue-os/akmods-nvidia" -ARG AKMODS_VERSION="37" +ARG AKMODS_VERSION="38" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}" -ARG NVIDIA_MAJOR_VERSION="525" +ARG NVIDIA_MAJOR_VERSION="535" COPY --from=${AKMODS_CACHE}:${AKMODS_VERSION}-${NVIDIA_MAJOR_VERSION} / . From 182798f9430da9b85c61427362996a3a6f9367af Mon Sep 17 00:00:00 2001 From: Robert Date: Sat, 24 Jun 2023 16:46:35 +0100 Subject: [PATCH 8/8] exclude F37 v530 builds --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3b7aeb0..5696ccf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,6 +24,8 @@ jobs: exclude: - driver_version: 470 major_version: 38 + - driver_version: 530 + major_version: 37 steps: # Checkout push-to-registry action GitHub repository - name: Checkout Push to Registry action @@ -191,6 +193,8 @@ jobs: major_version: 37 - driver_version: 470 major_version: 38 + - driver_version: 530 + major_version: 37 steps: # Checkout push-to-registry action GitHub repository - name: Checkout Push to Registry action