chore: enable Fedora 43 builds

.github/workflows/build-beta.yml

@@ -1,10 +1,8 @@
 name: ublue beta
 
 on:
-  # pull_request:
-  # merge_group:
-  # schedule:
-  #   - cron: "5 4 * * *" # 4am-ish UTC everyday (timed against official fedora container pushes)
+  pull_request:
+  merge_group:
   workflow_dispatch:
 
 concurrency:

build_files/install.sh

@@ -59,7 +59,32 @@ KERNEL_RPMS=(
     "/tmp/kernel-rpms/kernel-modules-core-${KERNEL_VERSION}.rpm"
     "/tmp/kernel-rpms/kernel-modules-extra-${KERNEL_VERSION}.rpm"
 )
+
+# on F43, a new problem manifests where during kernel install, dracut errors and fails
+
+# shim to bypass all of kernel-install... safe?
+#mv /usr/sbin/kernel-install /usr/sbin/kernel-install.bak
+#printf '%s\n' '#!/bin/sh' 'exit 0' > /usr/sbin/kernel-install
+#mv -f /usr/sbin/kernel-install.bak /usr/sbin/kernel-install
+
+# create a shims to bypass kernel install triggering dracut/rpm-ostree
+# seems to be minimal impact, but allows progress on build
+cd /usr/lib/kernel/install.d \
+&& mv 05-rpmostree.install 05-rpmostree.install.bak \
+&& mv 50-dracut.install 50-dracut.install.bak \
+&& printf '%s\n' '#!/bin/sh' 'exit 0' > 05-rpmostree.install \
+&& printf '%s\n' '#!/bin/sh' 'exit 0' > 50-dracut.install \
+&& chmod +x  05-rpmostree.install 50-dracut.install
+
+# instead of shims, could skip scriptlets: dnf install -y --setopt=tsflags=noscripts
+# but skipping all scriptlets for kernel install may not be safe
 dnf5 -y install "${KERNEL_RPMS[@]}"
+
+# restore kernel install
+mv -f 05-rpmostree.install.bak 05-rpmostree.install \
+&& mv -f 50-dracut.install.bak 50-dracut.install
+cd -
+
 dnf5 versionlock add kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra
 
 # use override to replace mesa and others with less crippled versions

build_files/nvidia-install.sh

@@ -83,9 +83,15 @@ dnf5 install -y \
     nvidia-driver-cuda-libs.i686 \
     nvidia-driver-libs.i686 \
     nvidia-settings \
-    nvidia-container-toolkit ${VARIANT_PKGS} \
+    ${VARIANT_PKGS} \
     "${AKMODNV_PATH}"/kmods/kmod-nvidia-"${KERNEL_VERSION}"-"${NVIDIA_AKMOD_VERSION}"."${DIST_ARCH}".rpm
 
+# nvidia-container-toolkit is not built with required crypto digests for RPM
+# 6+, introduced in Fedora 43
+if [[ "${RELEASE}" -ne 43 ]]; then
+    dnf5 install -y nvidia-container-toolkit
+fi
+
 # Ensure the version of the Nvidia module matches the driver
 KMOD_VERSION="$(rpm -q --queryformat '%{VERSION}' kmod-nvidia)"
 DRIVER_VERSION="$(rpm -q --queryformat '%{VERSION}' nvidia-driver)"

image-versions.yaml

@@ -1,4 +1,5 @@
 images:
+  # Fedora 41
   - name: akmods-41
     image: ghcr.io/ublue-os/akmods
     tag: main-41
@@ -20,6 +21,7 @@ images:
     tag: 41
     digest: sha256:e5c744d1c4020e5bf4452e5163094f61f85f777028b943cb94d6b8cda7393873
 
+  # Fedora 42
   - name: akmods-42
     image: ghcr.io/ublue-os/akmods
     tag: main-42
@@ -40,3 +42,25 @@ images:
     image: quay.io/fedora-ostree-desktops/kinoite
     tag: 42
     digest: sha256:49d55fb8edf523e2eb7063ebcf93146524849181ec4620c99bc7fad5327202b5
+
+  # Fedora 43
+  - name: akmods-43
+    image: ghcr.io/ublue-os/akmods
+    tag: main-43
+    digest: sha256:bdc781aec87a8e5f6c180de2f02bd99da0bf646eb0d76495f6fa729505cd8d01
+  - name: akmods-nvidia-open-43
+    image: ghcr.io/ublue-os/akmods-nvidia-open
+    tag: main-43
+    digest: sha256:a0c37bb4d856f2911ba5634cc72fbebab379a81c570bbb0d7ed0c5ef12a60250
+  - name: base-atomic-43
+    image: quay.io/fedora-ostree-desktops/base-atomic
+    tag: 43
+    digest: sha256:105eb4fe6f019a8657339d86763f4281ddf89a2916d37418e8c806890ccfdcb1
+  - name: silverblue-43
+    image: quay.io/fedora-ostree-desktops/silverblue
+    tag: 43
+    digest: sha256:885d6cf496c111a1f137ae70d0cc336cc9da9357d6c25b2fbcfb168bf53d9fea
+  - name: kinoite-43
+    image: quay.io/fedora-ostree-desktops/kinoite
+    tag: 43
+    digest: sha256:8b6a2ca18b1f857f2a03c23629c45e7af5fd5cdcbe0271b7abe3ba6a3d9ba14a

packages.json

@@ -3,7 +3,6 @@
         "include": {
             "all": [
                 "alsa-firmware",
-                "android-udev-rules",
                 "apr",
                 "apr-util",
                 "distrobox",
@@ -34,7 +33,6 @@
                 "libratbag-ratbagd",
                 "libva-utils",
                 "lshw",
-                "mesa-libxatracker",
                 "net-tools",
                 "nvme-cli",
                 "nvtop",
@@ -44,7 +42,6 @@
                 "pam-u2f",
                 "pam_yubico",
                 "pamu2fcfg",
-                "pipewire-libs-extra",
                 "pipewire-plugin-libcamera",
                 "powerstat",
                 "smartmontools",
@@ -96,15 +93,23 @@
     },
     "41": {
         "include": {
-            "all": []
+            "all": [
+                "android-udev-rules",
+                "mesa-libxatracker",
+                "pipewire-libs-extra"
+            ]
         },
         "exclude": {
             "all": []
         }
     },
     "42": {
         "include": {
-            "all": []
+            "all": [
+                "android-udev-rules",
+                "mesa-libxatracker",
+                "pipewire-libs-extra"
+            ]
         },
         "exclude": {
             "all": []