Merge upstream

.github/workflows/build-41.yml

@@ -0,0 +1,15 @@
+name: ublue main 41
+on:
+  pull_request:
+  merge_group:
+  schedule:
+    - cron: '5 4 * * *'  # 4am-ish UTC everyday (timed against official fedora container pushes)
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: build
+    uses: ./.github/workflows/reusable-build.yml
+    secrets: inherit
+    with:
+      fedora_version: 41

.github/workflows/reusable-build.yml

@@ -63,14 +63,17 @@ jobs:
             IS_LATEST_VERSION=false
             IS_STABLE_VERSION=true
             IS_GTS_VERSION=true
+            IS_BETA_VERSION=false
           elif [[ "${{ matrix.fedora_version }}" -eq "40" ]]; then
             IS_LATEST_VERSION=true
             IS_STABLE_VERSION=true
             IS_GTS_VERSION=false
+            IS_BETA_VERSION=false
           elif [[ "${{ matrix.fedora_version }}" -eq "41" ]]; then
             IS_LATEST_VERSION=false
             IS_STABLE_VERSION=false
             IS_GTS_VERSION=false
+            IS_BETA_VERSION=true
           fi
 
           COMMIT_TAGS=()
@@ -103,6 +106,10 @@ jobs:
               BUILD_TAGS+=("gts-${TIMESTAMP}")
               BUILD_TAGS+=("gts")
               echo "DEFAULT_TAG=gts" >> $GITHUB_ENV
+          elif [[ "${IS_BETA_VERSION}" == "true" ]]; then
+              BUILD_TAGS+=("beta-${TIMESTAMP}")
+              BUILD_TAGS+=("beta")
+              echo "DEFAULT_TAG=beta" >> $GITHUB_ENV
           fi
 
           if [[ "${{ github.event_name }}" == "pull_request" ]]; then

install.sh

@@ -40,10 +40,8 @@ sed -i '0,/enabled=1/{s/enabled=1/enabled=1\npriority=90/}' /etc/yum.repos.d/neg
 rpm-ostree override replace \
   --experimental \
   --from repo='fedora-multimedia' \
-    libheif \
     libva \
     libva-intel-media-driver \
-    libvdpau \
     mesa-dri-drivers \
     mesa-filesystem \
     mesa-libEGL \
@@ -54,12 +52,26 @@ rpm-ostree override replace \
     mesa-va-drivers \
     mesa-vulkan-drivers
 
+if [[ "$FEDORA_MAJOR_VERSION" -ne "41" ]]; then
+    rpm-ostree override replace \
+        --experimental \
+        --from repo='fedora-multimedia' \
+        libheif \
+        libvdpau
+fi
+
 # run common packages script
 /ctx/packages.sh
 
 ## install packages direct from github
 /ctx/github-release-install.sh sigstore/cosign x86_64
 
+# use CoreOS' generator for emergency/rescue boot
+# see detail: https://github.com/ublue-os/main/issues/653
+CSFG=/usr/lib/systemd/system-generators/coreos-sulogin-force-generator
+curl -sSLo ${CSFG} https://raw.githubusercontent.com/coreos/fedora-coreos-config/refs/heads/stable/overlay.d/05core/usr/lib/systemd/system-generators/coreos-sulogin-force-generator
+chmod +x ${CSFG}
+
 if [[ "${KERNEL_VERSION}" == "${QUALIFIED_KERNEL}" ]]; then
     /ctx/initramfs.sh
 fi

packages.json

@@ -20,7 +20,6 @@
                 "grub2-tools-extra",
                 "heif-pixbuf-loader",
                 "htop",
-                "intel-vaapi-driver",
                 "just",
                 "kernel-tools",
                 "libcamera",
@@ -40,7 +39,6 @@
                 "pam-u2f",
                 "pam_yubico",
                 "pamu2fcfg",
-                "pipewire-libs-extra",
                 "pipewire-plugin-libcamera",
                 "powerstat",
                 "smartmontools",
@@ -92,7 +90,8 @@
                 "libavutil-free",
                 "libpostproc-free",
                 "libswresample-free",
-                "libswscale-free"
+                "libswscale-free",
+                "default-fonts-cjk-sans"
             ],
             "kinoite": [
                 "ffmpegthumbnailer",
@@ -107,30 +106,40 @@
     "39": {
         "include": {
             "all": [
-                "bootc"
+                "bootc",
+                "intel-vaapi-driver",
+                "pipewire-libs-extra"
             ],
             "kinoite": [
                 "xwaylandvideobridge"
             ]
         },
         "exclude": {
-            "all": [
-                "default-fonts-cjk-sans"
-            ]
+            "all": []
         }
     },
     "40": {
         "include": {
-            "all": [],
+            "all": [
+                "intel-vaapi-driver",
+                "pipewire-libs-extra"
+            ],
             "kinoite": [
                 "kf6-kimageformats",
                 "qt6-qtimageformats"
             ]
         },
         "exclude": {
-            "all": [
-                "default-fonts-cjk-sans"
-            ]
+            "all": []
+        }
+    },
+    "41": {
+        "include": {
+            "all": [],
+            "kinoite": []
+        },
+        "exclude": {
+            "all": []
         }
     }
 }